diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/legacy/LegacySessionImporter.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/legacy/LegacySessionImporter.kt
index 533f387ec8..7856bd2c34 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/legacy/LegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/legacy/LegacySessionImporter.kt
@@ -20,6 +20,7 @@ interface LegacySessionImporter {
 
     /**
      * Will eventually import a session created by the legacy app.
+     * @return true if a session has been imported
      */
-    fun process()
+    fun process(): Boolean
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/DefaultLegacySessionImporter.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/DefaultLegacySessionImporter.kt
index 568f9a521a..82e339776a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/DefaultLegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/DefaultLegacySessionImporter.kt
@@ -53,14 +53,14 @@ internal class DefaultLegacySessionImporter @Inject constructor(
         private var DELETE_PREVIOUS_DATA = true
     }
 
-    override fun process() {
+    override fun process(): Boolean {
         Timber.d("Migration: Importing legacy session")
 
         val list = loginStorage.credentialsList
 
         Timber.d("Migration: found ${list.size} session(s).")
 
-        val legacyConfig = list.firstOrNull() ?: return
+        val legacyConfig = list.firstOrNull() ?: return false
 
         runBlocking {
             Timber.d("Migration: importing a session")
@@ -97,6 +97,9 @@ internal class DefaultLegacySessionImporter @Inject constructor(
                 Timber.d("Migration: clear shared prefs - DEACTIVATED")
             }
         }
+
+        // A session has been imported
+        return true
     }
 
     private suspend fun importCredentials(legacyConfig: LegacyHomeServerConnectionConfig) {
diff --git a/vector/build.gradle b/vector/build.gradle
index b743bb4401..3dc2a0deee 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -15,9 +15,9 @@ androidExtensions {
 }
 
 // Note: 2 digits max for each value
-ext.versionMajor = 0
-ext.versionMinor = 91
-ext.versionPatch = 6
+ext.versionMajor = 1
+ext.versionMinor = 0
+ext.versionPatch = 0
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -72,7 +72,7 @@ static def getGplayVersionSuffix() {
     if (gitBranchName() == "master") {
         return ""
     } else {
-        return "-dev"
+        return "" // TODO revert this commit "-dev"
     }
 }
 
@@ -183,7 +183,7 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
-            resValue "string", "app_name", "Riot.imX dbg"
+            resValue "string", "app_name", "Element dbg"
 
             resValue "bool", "debug_mode", "true"
             buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
@@ -192,7 +192,7 @@ android {
         }
 
         release {
-            resValue "string", "app_name", "Riot.imX"
+            resValue "string", "app_name", "Element (Riot.im)"
 
             resValue "bool", "debug_mode", "false"
             buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 155c3bcd64..ef591de1b6 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -136,6 +136,7 @@
 
                 <data android:scheme="https" />
                 <data android:host="riot.im" />
+                <data android:host="element.io" />
                 <data android:pathPrefix="/config/" />
             </intent-filter>
         </activity>
diff --git a/vector/src/main/java/im/vector/riotx/VectorApplication.kt b/vector/src/main/java/im/vector/riotx/VectorApplication.kt
index db14dba93d..241240d7e3 100644
--- a/vector/src/main/java/im/vector/riotx/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/riotx/VectorApplication.kt
@@ -43,6 +43,7 @@ import im.vector.riotx.core.di.VectorComponent
 import im.vector.riotx.core.extensions.configureAndStart
 import im.vector.riotx.core.rx.RxConfig
 import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.disclaimer.doNotShowDisclaimerDialog
 import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks
 import im.vector.riotx.features.notifications.NotificationDrawerManager
 import im.vector.riotx.features.notifications.NotificationUtils
@@ -123,7 +124,11 @@ class VectorApplication :
         notificationUtils.createNotificationChannels()
 
         // It can takes time, but do we care?
-        legacySessionImporter.process()
+        val sessionImported = legacySessionImporter.process()
+        if (!sessionImported) {
+            // Do not display the name change popup
+            doNotShowDisclaimerDialog(this)
+        }
 
         if (authenticationService.hasAuthenticatedSessions() && !activeSessionHolder.hasActiveSession()) {
             val lastAuthenticatedSession = authenticationService.getLastAuthenticatedSession()!!
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
index 7497caeeb9..7275136382 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt
@@ -68,7 +68,7 @@ class ExportKeysDialog {
             passwordVisible = !passwordVisible
             passPhrase1EditText.showPassword(passwordVisible)
             passPhrase2EditText.showPassword(passwordVisible)
-            showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
         }
 
         val exportDialog = builder.show()
diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt
index a05c9dec05..3f1582563c 100644
--- a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt
+++ b/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt
@@ -49,7 +49,7 @@ class PromptPasswordDialog {
         showPassword.setOnClickListener {
             passwordVisible = !passwordVisible
             passwordEditText.showPassword(passwordVisible)
-            showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            showPassword.setImageResource(if (passwordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
         }
 
         AlertDialog.Builder(activity)
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
index 3b2efebc5d..8051804145 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
@@ -21,7 +21,7 @@ import im.vector.riotx.R
 
 /**
  * Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color).
- * To use in fragment, set color using R.attr.vctr_list_divider_color
+ * To use in fragment, set color using R.attr.riotx_list_divider_color
  */
 @EpoxyModelClass(layout = R.layout.item_divider)
 abstract class DividerItem : VectorEpoxyModel<DividerItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt
index 80b78d0d70..c06307387d 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt
@@ -75,17 +75,22 @@ abstract class ProfileActionItem : VectorEpoxyModel<ProfileActionItem.Holder>()
             holder.view.isClickable = false
         }
         holder.title.text = title
-        val tintColor = if (destructive) {
+        val titleTintColor = if (destructive) {
             ContextCompat.getColor(holder.view.context, R.color.riotx_notice)
         } else {
             ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_primary)
         }
-        holder.title.setTextColor(tintColor)
+        val iconTintColor = if (destructive) {
+            ContextCompat.getColor(holder.view.context, R.color.riotx_notice)
+        } else {
+            ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
+        }
+        holder.title.setTextColor(titleTintColor)
         holder.subtitle.setTextOrHide(subtitle)
         if (iconRes != 0) {
             holder.icon.setImageResource(iconRes)
             if (tintIcon) {
-                ImageViewCompat.setImageTintList(holder.icon, ColorStateList.valueOf(tintColor))
+                ImageViewCompat.setImageTintList(holder.icon, ColorStateList.valueOf(iconTintColor))
             } else {
                 ImageViewCompat.setImageTintList(holder.icon, null)
             }
@@ -110,7 +115,7 @@ abstract class ProfileActionItem : VectorEpoxyModel<ProfileActionItem.Holder>()
 
         if (editableRes != 0 && editable) {
             val tintColorSecondary = if (destructive) {
-                tintColor
+                titleTintColor
             } else {
                 ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
             }
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt b/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
index 5889375bb9..e0e2a78de5 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt
@@ -27,7 +27,7 @@ import im.vector.riotx.R
 import im.vector.riotx.core.platform.SimpleTextWatcher
 
 fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_filter,
-                           @DrawableRes clearIconRes: Int = R.drawable.ic_x_green) {
+                           @DrawableRes clearIconRes: Int = R.drawable.ic_x_gray) {
     addTextChangedListener(object : SimpleTextWatcher() {
         override fun afterTextChanged(s: Editable) {
             val clearIcon = if (s.isNotEmpty()) clearIconRes else 0
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
index 2f07c2ade3..4c007e60d6 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt
@@ -102,7 +102,7 @@ fun Fragment.queryExportKeys(userId: String, requestCode: Int) {
     selectTxtFileToWrite(
             activity = requireActivity(),
             fragment = this,
-            defaultFileName = "riot-megolm-export-$userId-$timestamp.txt",
+            defaultFileName = "element-megolm-export-$userId-$timestamp.txt",
             chooserHint = getString(R.string.keys_backup_setup_step1_manual_export),
             requestCode = requestCode
     )
@@ -114,7 +114,7 @@ fun Activity.queryExportKeys(userId: String, requestCode: Int) {
     selectTxtFileToWrite(
             activity = this,
             fragment = null,
-            defaultFileName = "riot-megolm-export-$userId-$timestamp.txt",
+            defaultFileName = "element-megolm-export-$userId-$timestamp.txt",
             chooserHint = getString(R.string.keys_backup_setup_step1_manual_export),
             requestCode = requestCode
     )
diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
index 9dcccc5b7b..d71bcccd5b 100644
--- a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
+++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt
@@ -23,6 +23,8 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceViewHolder
+import im.vector.riotx.R
+import im.vector.riotx.features.themes.ThemeUtils
 
 /**
  * Customize PreferenceCategory class to redefine some attributes.
@@ -46,6 +48,7 @@ class VectorPreferenceCategory : PreferenceCategory {
         val titleTextView = holder.itemView.findViewById<TextView>(android.R.id.title)
 
         titleTextView?.setTypeface(null, Typeface.BOLD)
+        titleTextView?.setTextColor(ThemeUtils.getColor(context, R.attr.riotx_text_primary))
 
         // "isIconSpaceReserved = false" does not work for preference category, so remove the padding
         if (!isIconSpaceReserved) {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
index e334603b74..b302b57433 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
@@ -74,7 +74,7 @@ class KeysBackupRestoreFromPassphraseFragment @Inject constructor() : VectorBase
         viewModel.showPasswordMode.observe(viewLifecycleOwner, Observer {
             val shouldBeVisible = it ?: false
             mPassphraseTextEdit.showPassword(shouldBeVisible)
-            mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
         })
 
         mPassphraseTextEdit.setOnEditorActionListener { _, actionId, _ ->
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
index 40ea79eb6d..95fe9b0ffa 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
@@ -141,7 +141,7 @@ class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment()
             val shouldBeVisible = it ?: false
             mPassphraseTextEdit.showPassword(shouldBeVisible)
             mPassphraseConfirmTextEdit.showPassword(shouldBeVisible)
-            mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            mPassphraseReveal.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
         })
 
         viewModel.confirmPassphraseError.observe(viewLifecycleOwner, Observer {
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
index 95d8579a9b..c14b452a60 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
@@ -97,6 +97,6 @@ class SharedSecuredStoragePassphraseFragment @Inject constructor(
     override fun invalidate() = withState(sharedViewModel) { state ->
         val shouldBeVisible = state.passphraseVisible
         ssss_passphrase_enter_edittext.showPassword(shouldBeVisible)
-        ssss_view_show_password.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+        ssss_view_show_password.setImageResource(if (shouldBeVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt
index fd7d269e01..dca8cd4227 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt
@@ -101,7 +101,7 @@ class BootstrapAccountPasswordFragment @Inject constructor(
         if (state.step is BootstrapStep.AccountPassword) {
             val isPasswordVisible = state.step.isPasswordVisible
             bootstrapAccountPasswordEditText.showPassword(isPasswordVisible, updateCursor = false)
-            ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
index e37f2763ab..bed3b96a5d 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
@@ -103,7 +103,7 @@ class BootstrapConfirmPassphraseFragment @Inject constructor() : VectorBaseFragm
         if (state.step is BootstrapStep.ConfirmPassphrase) {
             val isPasswordVisible = state.step.isPasswordVisible
             ssss_passphrase_enter_edittext.showPassword(isPasswordVisible, updateCursor = false)
-            ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
index aad6ed2aa0..b7bd38a5eb 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
@@ -97,7 +97,7 @@ class BootstrapEnterPassphraseFragment @Inject constructor() : VectorBaseFragmen
         if (state.step is BootstrapStep.SetupPassphrase) {
             val isPasswordVisible = state.step.isPasswordVisible
             ssss_passphrase_enter_edittext.showPassword(isPasswordVisible, updateCursor = false)
-            ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+            ssss_view_show_password.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
 
             state.passphraseStrength.invoke()?.let { strength ->
                 val score = strength.score
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
index 141edb2c58..053ffee1f4 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
@@ -129,7 +129,7 @@ class BootstrapMigrateBackupFragment @Inject constructor(
             if (state.step is BootstrapStep.GetBackupSecretPassForMigration) {
                 val isPasswordVisible = state.step.isPasswordVisible
                 bootstrapMigrateEditText.showPassword(isPasswordVisible, updateCursor = false)
-                bootstrapMigrateShowPassword.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+                bootstrapMigrateShowPassword.setImageResource(if (isPasswordVisible) R.drawable.ic_eye_closed else R.drawable.ic_eye)
             }
 
             bootstrapDescriptionText.text = getString(R.string.bootstrap_migration_enter_backup_password)
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
index 2c31474122..1808c99629 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
@@ -61,7 +61,7 @@ class BootstrapSaveRecoveryKeyFragment @Inject constructor(
         val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
         intent.addCategory(Intent.CATEGORY_OPENABLE)
         intent.type = "text/plain"
-        intent.putExtra(Intent.EXTRA_TITLE, "riot-recovery-key.txt")
+        intent.putExtra(Intent.EXTRA_TITLE, "element-recovery-key.txt")
 
         try {
             sharedViewModel.handle(BootstrapActions.SaveReqQueryStarted)
diff --git a/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt b/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
index 86b7fd9fc8..51c61c99a9 100644
--- a/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
+++ b/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt
@@ -17,18 +17,16 @@
 package im.vector.riotx.features.disclaimer
 
 import android.app.Activity
-import androidx.preference.PreferenceManager
-import android.view.ViewGroup
-import android.widget.TextView
+import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
-import im.vector.riotx.BuildConfig
+import androidx.preference.PreferenceManager
 import im.vector.riotx.R
-import im.vector.riotx.core.extensions.setTextWithColoredPart
-import im.vector.riotx.core.utils.openPlayStore
+import im.vector.riotx.core.utils.openUrlInChromeCustomTab
+import im.vector.riotx.features.settings.VectorSettingsUrls
 
 // Increase this value to show again the disclaimer dialog after an upgrade of the application
-private const val CURRENT_DISCLAIMER_VALUE = 1
+private const val CURRENT_DISCLAIMER_VALUE = 2
 
 private const val SHARED_PREF_KEY = "LAST_DISCLAIMER_VERSION_VALUE"
 
@@ -42,22 +40,21 @@ fun showDisclaimerDialog(activity: Activity) {
 
         val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_disclaimer_content, null)
 
-        val textView = (dialogLayout as ViewGroup).findViewById<TextView>(R.id.dialogDisclaimerContentLine2)
-        @Suppress("ConstantConditionIf")
-        if (BuildConfig.FLAVOR == "gplay") {
-            textView.setTextWithColoredPart(R.string.alpha_disclaimer_content_line_2_gplay, R.string.alpha_disclaimer_content_line_2_gplay_colored_part)
-
-            textView.setOnClickListener {
-                openPlayStore(activity)
-            }
-        } else {
-            textView.setText(R.string.alpha_disclaimer_content_line_2_fdroid)
-        }
-
         AlertDialog.Builder(activity)
                 .setView(dialogLayout)
                 .setCancelable(false)
-                .setPositiveButton(R.string._continue, null)
+                .setNegativeButton(R.string.element_disclaimer_negative_button, null)
+                .setPositiveButton(R.string.element_disclaimer_positive_button) { _, _ ->
+                    openUrlInChromeCustomTab(activity, null, VectorSettingsUrls.DISCLAIMER_URL)
+                }
                 .show()
     }
 }
+
+fun doNotShowDisclaimerDialog(context: Context) {
+    val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context)
+
+    sharedPrefs.edit {
+        putInt(SHARED_PREF_KEY, CURRENT_DISCLAIMER_VALUE)
+    }
+}
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
index 74475406ed..66c8e87e2c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
@@ -65,10 +65,6 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
         RoomListQuickActionsSharedAction.NotificationsMute(roomSummary.roomId).toBottomSheetItem(3, selectedRoomState)
 
         if (showAll) {
-            // Leave
-            dividerItem {
-                id("leave_separator")
-            }
             RoomListQuickActionsSharedAction.Leave(roomSummary.roomId).toBottomSheetItem(5)
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
index ef8281fa89..b7de44aa24 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
@@ -157,8 +157,8 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
                 }
                 ServerType.Modular   -> {
                     loginServerIcon.isVisible = true
-                    loginServerIcon.setImageResource(R.drawable.ic_logo_modular)
-                    loginTitle.text = getString(resId, "Modular")
+                    loginServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
+                    loginTitle.text = getString(resId, "Element Matrix Services")
                     loginNotice.text = getString(R.string.login_server_modular_text)
                 }
                 ServerType.Other     -> {
@@ -221,10 +221,10 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
         passwordField.showPassword(passwordShown)
 
         if (passwordShown) {
-            passwordReveal.setImageResource(R.drawable.ic_eye_closed_black)
+            passwordReveal.setImageResource(R.drawable.ic_eye_closed)
             passwordReveal.contentDescription = getString(R.string.a11y_hide_password)
         } else {
-            passwordReveal.setImageResource(R.drawable.ic_eye_black)
+            passwordReveal.setImageResource(R.drawable.ic_eye)
             passwordReveal.contentDescription = getString(R.string.a11y_show_password)
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt
index d90cfc77e5..ba3c8e1123 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt
@@ -124,10 +124,10 @@ class LoginResetPasswordFragment @Inject constructor() : AbstractLoginFragment()
         passwordField.showPassword(passwordShown)
 
         if (passwordShown) {
-            passwordReveal.setImageResource(R.drawable.ic_eye_closed_black)
+            passwordReveal.setImageResource(R.drawable.ic_eye_closed)
             passwordReveal.contentDescription = getString(R.string.a11y_hide_password)
         } else {
-            passwordReveal.setImageResource(R.drawable.ic_eye_black)
+            passwordReveal.setImageResource(R.drawable.ic_eye)
             passwordReveal.contentDescription = getString(R.string.a11y_show_password)
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
index 28331bc99e..980525363a 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
@@ -68,7 +68,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment()
                 loginServerUrlFormText.text = getString(R.string.login_server_url_form_modular_text)
                 loginServerUrlFormLearnMore.isVisible = true
                 loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_modular_hint)
-                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_modular_notice)
+                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
             }
             else               -> {
                 loginServerUrlFormIcon.isVisible = false
@@ -76,7 +76,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment()
                 loginServerUrlFormText.text = getString(R.string.login_connect_to_a_custom_server)
                 loginServerUrlFormLearnMore.isVisible = false
                 loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_other_hint)
-                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_other_notice)
+                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
index 6ac5993f30..d0b814b6d5 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
@@ -39,7 +39,7 @@ open class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractLo
                 loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text)
             }
             ServerType.Modular   -> {
-                loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_modular)
+                loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
                 loginSignupSigninServerIcon.isVisible = true
                 loginSignupSigninTitle.text = getString(R.string.login_connect_to_modular)
                 loginSignupSigninText.text = state.homeServerUrl.toReducedUrl()
diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
index ad5e2c6d3d..9bb2eb9424 100755
--- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt
@@ -220,7 +220,7 @@ class BugReporter @Inject constructor(
                 }
 
                 if (!mIsCancelled) {
-                    val text = "[Riot.imX] " +
+                    val text = "[Element] " +
                             if (forSuggestion) {
                                 "[Suggestion] "
                             } else {
@@ -292,7 +292,7 @@ class BugReporter @Inject constructor(
                     builder.addFormDataPart("label", context.getString(R.string.git_branch_name))
 
                     // Special for RiotX
-                    builder.addFormDataPart("label", "[Riot.imX]")
+                    builder.addFormDataPart("label", "[Element]")
 
                     // Suggestion
                     if (forSuggestion) {
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
index 6bfb88a480..209cedda2c 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
@@ -158,7 +158,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
             // It does not work on XML, do it here
             it.icon = activity?.let {
                 ThemeUtils.tintDrawable(it,
-                        ContextCompat.getDrawable(it, R.drawable.ic_add_black)!!, R.attr.vctr_settings_icon_tint_color)
+                        ContextCompat.getDrawable(it, R.drawable.ic_material_add)!!, R.attr.colorAccent)
             }
 
             // Unfortunately, this is not supported in lib v7
@@ -180,7 +180,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
             // It does not work on XML, do it here
             it.icon = activity?.let {
                 ThemeUtils.tintDrawable(it,
-                        ContextCompat.getDrawable(it, R.drawable.ic_add_black)!!, R.attr.vctr_settings_icon_tint_color)
+                        ContextCompat.getDrawable(it, R.drawable.ic_material_add)!!, R.attr.colorAccent)
             }
 
             it.setOnPreferenceClickListener {
@@ -817,7 +817,7 @@ private fun showEmailValidationDialog(pid: ThreePid) {
                 newPasswordText.showPassword(passwordShown)
                 confirmNewPasswordText.showPassword(passwordShown)
 
-                showPassword.setImageResource(if (passwordShown) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+                showPassword.setImageResource(if (passwordShown) R.drawable.ic_eye_closed else R.drawable.ic_eye)
             }
 
             val dialog = AlertDialog.Builder(activity)
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
index 7b892ec88b..a8c2569c40 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -25,6 +25,7 @@ import im.vector.riotx.R
 import im.vector.riotx.core.preference.VectorPreference
 import im.vector.riotx.core.utils.copyToClipboard
 import im.vector.riotx.core.utils.displayInWebView
+import im.vector.riotx.core.utils.openUrlInChromeCustomTab
 import im.vector.riotx.features.version.VersionProvider
 import im.vector.riotx.openOssLicensesMenuActivity
 import javax.inject.Inject
@@ -82,21 +83,21 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
         // copyright
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_COPYRIGHT_PREFERENCE_KEY)!!
                 .onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            activity?.displayInWebView(VectorSettingsUrls.COPYRIGHT)
+            openUrlInChromeCustomTab(requireContext(), null, VectorSettingsUrls.COPYRIGHT)
             false
         }
 
         // terms & conditions
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY)!!
                 .onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            activity?.displayInWebView(VectorSettingsUrls.TAC)
+            openUrlInChromeCustomTab(requireContext(), null, VectorSettingsUrls.TAC)
             false
         }
 
         // privacy policy
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY)!!
                 .onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            activity?.displayInWebView(VectorSettingsUrls.PRIVACY_POLICY)
+            openUrlInChromeCustomTab(requireContext(), null, VectorSettingsUrls.PRIVACY_POLICY)
             false
         }
 
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
index 9d1727144b..3bd24b6e08 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt
@@ -18,8 +18,9 @@ package im.vector.riotx.features.settings
 
 object VectorSettingsUrls {
 
-    const val COPYRIGHT = "https://riot.im/copyright"
-    const val TAC = "https://riot.im/tac"
-    const val PRIVACY_POLICY = "https://riot.im/privacy"
+    const val COPYRIGHT = "https://element.io/copyright"
+    const val TAC = "https://element.io/terms-of-service"
+    const val PRIVACY_POLICY = "https://element.io/privacy"
+    const val DISCLAIMER_URL = "https://element.io/previously-riot"
     const val THIRD_PARTY_LICENSES = "file:///android_asset/open_source_licenses.html"
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
index 447f1086be..eb0adf1f17 100644
--- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt
@@ -114,6 +114,6 @@ class DeactivateAccountFragment @Inject constructor(
 
     override fun invalidate() = withState(viewModel) { state ->
         deactivateAccountPassword.showPassword(state.passwordShown)
-        deactivateAccountPasswordReveal.setImageResource(if (state.passwordShown) R.drawable.ic_eye_closed_black else R.drawable.ic_eye_black)
+        deactivateAccountPasswordReveal.setImageResource(if (state.passwordShown) R.drawable.ic_eye_closed else R.drawable.ic_eye)
     }
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt
index 6f7f45098d..17eee6b378 100644
--- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt
+++ b/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt
@@ -78,10 +78,10 @@ abstract class LoginPasswordFormItem : VectorEpoxyModel<LoginPasswordFormItem.Ho
         holder.passwordField.showPassword(passwordShown)
 
         if (passwordShown) {
-            holder.passwordReveal.setImageResource(R.drawable.ic_eye_closed_black)
+            holder.passwordReveal.setImageResource(R.drawable.ic_eye_closed)
             holder.passwordReveal.contentDescription = stringProvider.getString(R.string.a11y_hide_password)
         } else {
-            holder.passwordReveal.setImageResource(R.drawable.ic_eye_black)
+            holder.passwordReveal.setImageResource(R.drawable.ic_eye)
             holder.passwordReveal.contentDescription = stringProvider.getString(R.string.a11y_show_password)
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
index 6b5ade06c4..8fb1f63e65 100644
--- a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
@@ -32,7 +32,7 @@ import im.vector.riotx.features.webview.WebViewEventListener
 @SuppressLint("NewApi")
 fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
     // xml value seems ignored
-    setBackgroundColor(ThemeUtils.getColor(context, R.attr.vctr_bottom_nav_background_color))
+    setBackgroundColor(ThemeUtils.getColor(context, R.attr.riotx_bottom_nav_background_color))
 
     // clear caches
     clearHistory()
diff --git a/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml b/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
new file mode 100644
index 0000000000..4326827467
--- /dev/null
+++ b/vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/riotx_accent" android:state_checked="true" />
+    <item android:color="?riotx_bottom_nav_icon_color" />
+</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
index be23738b51..a02583ec02 100644
--- a/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
+++ b/vector/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml
@@ -4,29 +4,19 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
-      android:pathData="m103.426,146.731c10.234,10.234 27.539,9.521 38.653,-1.592s11.826,-28.419 1.592,-38.653c-10.234,-10.234 -72.627,-72.746 -72.627,-72.746l-7.951,9.069s1.497,6.213 -0.319,8.284c-1.816,2.071 -9.701,3.147 -9.701,3.147l-16.509,18.833s-1.861,4.935 -1.092,5.704z"
-      android:fillColor="#000"
-      android:fillAlpha=".7"
+      android:pathData="M47.28,32.88C47.28,31.289 48.569,30 50.16,30C60.764,30 69.36,38.596 69.36,49.2C69.36,50.791 68.071,52.08 66.48,52.08C64.89,52.08 63.6,50.791 63.6,49.2C63.6,41.777 57.583,35.76 50.16,35.76C48.569,35.76 47.28,34.471 47.28,32.88Z"
+      android:fillColor="#ffffff"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="m47.713,42.317v7.766l7.886,-0.008c0.1,0 0.192,-0.003 0.282,-0.009 2.073,-0.137 3.694,-1.837 3.694,-3.87 0,-2.139 -1.78,-3.879 -3.969,-3.879zM39.915,80.675c-4.307,0 -7.799,-3.413 -7.799,-7.623v-14.528c-0.028,-0.263 -0.043,-0.531 -0.043,-0.802 -0,-0.276 0.014,-0.549 0.043,-0.817v-22.21c0,-4.21 3.492,-7.624 7.799,-7.624h15.692c10.789,0 19.567,8.58 19.567,19.126 0,10.027 -8.012,18.408 -18.24,19.081 -0.435,0.029 -0.883,0.044 -1.327,0.044l-7.893,0.008v7.723c0,4.21 -3.491,7.623 -7.799,7.623z"
-      android:fillColor="#a2ddef"
+      android:pathData="M60.72,75.12C60.72,76.711 59.431,78 57.84,78C47.236,78 38.64,69.404 38.64,58.8C38.64,57.209 39.929,55.92 41.52,55.92C43.111,55.92 44.4,57.209 44.4,58.8C44.4,66.223 50.417,72.24 57.84,72.24C59.431,72.24 60.72,73.529 60.72,75.12Z"
+      android:fillColor="#ffffff"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="m47.713,42.317v7.766l7.886,-0.008c0.1,0 0.192,-0.003 0.282,-0.009 2.073,-0.137 3.694,-1.837 3.694,-3.87 0,-2.139 -1.78,-3.879 -3.969,-3.879zM39.915,80.675c-4.307,0 -7.799,-3.413 -7.799,-7.623v-38.358c0,-4.21 3.492,-7.624 7.799,-7.624h15.692c10.789,0 19.567,8.58 19.567,19.126 0,10.027 -8.012,18.408 -18.24,19.081 -0.435,0.029 -0.883,0.044 -1.327,0.044l-7.893,0.008v7.723c0,4.21 -3.491,7.623 -7.799,7.623z"
-      android:strokeWidth="1.372009"
-      android:fillColor="#00000000"
-      android:strokeColor="#368bd6"
+      android:pathData="M32.88,60.72C31.289,60.72 30,59.431 30,57.84C30,47.236 38.596,38.64 49.2,38.64C50.791,38.64 52.08,39.929 52.08,41.52C52.08,43.111 50.791,44.4 49.2,44.4C41.777,44.4 35.76,50.417 35.76,57.84C35.76,59.431 34.471,60.72 32.88,60.72Z"
+      android:fillColor="#ffffff"
       android:fillType="evenOdd"/>
   <path
-      android:pathData="m39.915,73.052v-38.358h15.692c6.499,0 11.767,5.15 11.767,11.502 0,6.089 -4.84,11.073 -10.964,11.476 -0.266,0.018 -0.533,0.027 -0.803,0.027h-15.692"
-      android:strokeWidth="1.372009"
-      android:fillColor="#00000000"
-      android:strokeColor="#368bd6"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m46.341,30.322c1.196,1.668 1.655,3.691 1.293,5.695 -0.362,2.005 -1.502,3.752 -3.21,4.92 -3.525,2.411 -8.402,1.572 -10.87,-1.871 -1.196,-1.668 -1.655,-3.691 -1.293,-5.696 0.362,-2.005 1.502,-3.752 3.21,-4.92 3.525,-2.411 8.401,-1.572 10.869,1.871zM67.439,80.671c-2.458,0 -4.876,-1.132 -6.394,-3.249l-11.022,-15.375c-2.472,-3.448 -1.616,-8.202 1.911,-10.617 3.527,-2.417 8.39,-1.58 10.862,1.868l11.022,15.375c2.472,3.448 1.616,8.202 -1.911,10.617 -1.362,0.933 -2.923,1.381 -4.469,1.381z"
-      android:fillColor="#368bd6"
+      android:pathData="M75.12,47.28C76.711,47.28 78,48.569 78,50.16C78,60.764 69.404,69.36 58.8,69.36C57.209,69.36 55.92,68.071 55.92,66.48C55.92,64.89 57.209,63.6 58.8,63.6C66.223,63.6 72.24,57.583 72.24,50.16C72.24,48.569 73.529,47.28 75.12,47.28Z"
+      android:fillColor="#ffffff"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable-hdpi/ic_attachment_stickers_white_24dp.png b/vector/src/main/res/drawable-hdpi/ic_attachment_stickers_white_24dp.png
index bf765cfc6d..d27e8f406e 100644
Binary files a/vector/src/main/res/drawable-hdpi/ic_attachment_stickers_white_24dp.png and b/vector/src/main/res/drawable-hdpi/ic_attachment_stickers_white_24dp.png differ
diff --git a/vector/src/main/res/drawable-hdpi/ic_eye_black.png b/vector/src/main/res/drawable-hdpi/ic_eye_black.png
deleted file mode 100644
index 336d9c9e8c..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/ic_eye_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-hdpi/ic_eye_closed_black.png b/vector/src/main/res/drawable-hdpi/ic_eye_closed_black.png
deleted file mode 100644
index 27a0f29c71..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/ic_eye_closed_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-hdpi/ic_status_bar.png b/vector/src/main/res/drawable-hdpi/ic_status_bar.png
index b956b8b12e..1f4abec485 100644
Binary files a/vector/src/main/res/drawable-hdpi/ic_status_bar.png and b/vector/src/main/res/drawable-hdpi/ic_status_bar.png differ
diff --git a/vector/src/main/res/drawable-hdpi/riot_splash_0_blue.png b/vector/src/main/res/drawable-hdpi/riot_splash_0_blue.png
deleted file mode 100644
index dd3bfef0dd..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/riot_splash_0_blue.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-hdpi/riot_splash_1_green.png b/vector/src/main/res/drawable-hdpi/riot_splash_1_green.png
deleted file mode 100644
index 6684cf94a0..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/riot_splash_1_green.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-hdpi/riot_splash_2_pink.png b/vector/src/main/res/drawable-hdpi/riot_splash_2_pink.png
deleted file mode 100644
index f2d5a54ae8..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/riot_splash_2_pink.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-hdpi/riot_splash_3_red.png b/vector/src/main/res/drawable-hdpi/riot_splash_3_red.png
deleted file mode 100644
index 67972beb77..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/riot_splash_3_red.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-hdpi/riot_splash_white.png b/vector/src/main/res/drawable-hdpi/riot_splash_white.png
new file mode 100644
index 0000000000..bf7ba19923
Binary files /dev/null and b/vector/src/main/res/drawable-hdpi/riot_splash_white.png differ
diff --git a/vector/src/main/res/drawable-mdpi/ic_attachment_stickers_white_24dp.png b/vector/src/main/res/drawable-mdpi/ic_attachment_stickers_white_24dp.png
index 3f4b3e50a5..40d78cf9e2 100644
Binary files a/vector/src/main/res/drawable-mdpi/ic_attachment_stickers_white_24dp.png and b/vector/src/main/res/drawable-mdpi/ic_attachment_stickers_white_24dp.png differ
diff --git a/vector/src/main/res/drawable-mdpi/ic_eye_black.png b/vector/src/main/res/drawable-mdpi/ic_eye_black.png
deleted file mode 100644
index 5309f18dd2..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/ic_eye_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/ic_eye_closed_black.png b/vector/src/main/res/drawable-mdpi/ic_eye_closed_black.png
deleted file mode 100644
index a88efe102e..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/ic_eye_closed_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/ic_status_bar.png b/vector/src/main/res/drawable-mdpi/ic_status_bar.png
index 2576e07f30..198cb2ea7c 100644
Binary files a/vector/src/main/res/drawable-mdpi/ic_status_bar.png and b/vector/src/main/res/drawable-mdpi/ic_status_bar.png differ
diff --git a/vector/src/main/res/drawable-mdpi/riot_splash_0_blue.png b/vector/src/main/res/drawable-mdpi/riot_splash_0_blue.png
deleted file mode 100644
index bfac9e92b3..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/riot_splash_0_blue.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/riot_splash_1_green.png b/vector/src/main/res/drawable-mdpi/riot_splash_1_green.png
deleted file mode 100644
index cd51252ab0..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/riot_splash_1_green.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/riot_splash_2_pink.png b/vector/src/main/res/drawable-mdpi/riot_splash_2_pink.png
deleted file mode 100644
index 99bdec2487..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/riot_splash_2_pink.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/riot_splash_3_red.png b/vector/src/main/res/drawable-mdpi/riot_splash_3_red.png
deleted file mode 100644
index 1bcb5e17db..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/riot_splash_3_red.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/riot_splash_white.png b/vector/src/main/res/drawable-mdpi/riot_splash_white.png
new file mode 100644
index 0000000000..caf92afec9
Binary files /dev/null and b/vector/src/main/res/drawable-mdpi/riot_splash_white.png differ
diff --git a/vector/src/main/res/drawable-xhdpi/ic_attachment_stickers_white_24dp.png b/vector/src/main/res/drawable-xhdpi/ic_attachment_stickers_white_24dp.png
index 0a96b2bc5d..46e23b9cdc 100644
Binary files a/vector/src/main/res/drawable-xhdpi/ic_attachment_stickers_white_24dp.png and b/vector/src/main/res/drawable-xhdpi/ic_attachment_stickers_white_24dp.png differ
diff --git a/vector/src/main/res/drawable-xhdpi/ic_eye_black.png b/vector/src/main/res/drawable-xhdpi/ic_eye_black.png
deleted file mode 100644
index 84cdf0f0d3..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/ic_eye_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/ic_eye_closed_black.png b/vector/src/main/res/drawable-xhdpi/ic_eye_closed_black.png
deleted file mode 100644
index 5bc1bc71d8..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/ic_eye_closed_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xhdpi/ic_status_bar.png
index 6586b2a065..7e74553f0b 100644
Binary files a/vector/src/main/res/drawable-xhdpi/ic_status_bar.png and b/vector/src/main/res/drawable-xhdpi/ic_status_bar.png differ
diff --git a/vector/src/main/res/drawable-xhdpi/riot_splash_0_blue.png b/vector/src/main/res/drawable-xhdpi/riot_splash_0_blue.png
deleted file mode 100644
index 44bab79858..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/riot_splash_0_blue.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/riot_splash_1_green.png b/vector/src/main/res/drawable-xhdpi/riot_splash_1_green.png
deleted file mode 100644
index 0b7bf76da4..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/riot_splash_1_green.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/riot_splash_2_pink.png b/vector/src/main/res/drawable-xhdpi/riot_splash_2_pink.png
deleted file mode 100644
index 9328f249ab..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/riot_splash_2_pink.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/riot_splash_3_red.png b/vector/src/main/res/drawable-xhdpi/riot_splash_3_red.png
deleted file mode 100644
index 393c69e4fb..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/riot_splash_3_red.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/riot_splash_white.png b/vector/src/main/res/drawable-xhdpi/riot_splash_white.png
new file mode 100644
index 0000000000..100bd78974
Binary files /dev/null and b/vector/src/main/res/drawable-xhdpi/riot_splash_white.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_attachment_stickers_white_24dp.png b/vector/src/main/res/drawable-xxhdpi/ic_attachment_stickers_white_24dp.png
index 6cd7ac653d..4058b25495 100644
Binary files a/vector/src/main/res/drawable-xxhdpi/ic_attachment_stickers_white_24dp.png and b/vector/src/main/res/drawable-xxhdpi/ic_attachment_stickers_white_24dp.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_eye_black.png b/vector/src/main/res/drawable-xxhdpi/ic_eye_black.png
deleted file mode 100644
index e864275e98..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/ic_eye_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_eye_closed_black.png b/vector/src/main/res/drawable-xxhdpi/ic_eye_closed_black.png
deleted file mode 100644
index 9ce30ba886..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/ic_eye_closed_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png
index a6930d5313..a86508b71b 100644
Binary files a/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png and b/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_splash_0_blue.png b/vector/src/main/res/drawable-xxhdpi/riot_splash_0_blue.png
deleted file mode 100644
index c7fc61c80e..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/riot_splash_0_blue.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_splash_1_green.png b/vector/src/main/res/drawable-xxhdpi/riot_splash_1_green.png
deleted file mode 100644
index 6d351f4e5c..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/riot_splash_1_green.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_splash_2_pink.png b/vector/src/main/res/drawable-xxhdpi/riot_splash_2_pink.png
deleted file mode 100644
index 2d0c2b0a66..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/riot_splash_2_pink.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_splash_3_red.png b/vector/src/main/res/drawable-xxhdpi/riot_splash_3_red.png
deleted file mode 100644
index 328f94403e..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/riot_splash_3_red.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_splash_white.png b/vector/src/main/res/drawable-xxhdpi/riot_splash_white.png
new file mode 100644
index 0000000000..4fe7160b65
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/riot_splash_white.png differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_attachment_stickers_white_24dp.png b/vector/src/main/res/drawable-xxxhdpi/ic_attachment_stickers_white_24dp.png
index eab49d19f6..c5b2435646 100644
Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_attachment_stickers_white_24dp.png and b/vector/src/main/res/drawable-xxxhdpi/ic_attachment_stickers_white_24dp.png differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_eye_black.png b/vector/src/main/res/drawable-xxxhdpi/ic_eye_black.png
deleted file mode 100644
index f3714d4c90..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_eye_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_eye_closed_black.png b/vector/src/main/res/drawable-xxxhdpi/ic_eye_closed_black.png
deleted file mode 100644
index 55c0c24729..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_eye_closed_black.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png
index b99c095a0c..f6170e1a25 100644
Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png and b/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_splash_0_blue.png b/vector/src/main/res/drawable-xxxhdpi/riot_splash_0_blue.png
deleted file mode 100644
index 471d973485..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/riot_splash_0_blue.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_splash_1_green.png b/vector/src/main/res/drawable-xxxhdpi/riot_splash_1_green.png
deleted file mode 100644
index 5bf748c2c8..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/riot_splash_1_green.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_splash_2_pink.png b/vector/src/main/res/drawable-xxxhdpi/riot_splash_2_pink.png
deleted file mode 100644
index 3e186682a6..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/riot_splash_2_pink.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_splash_3_red.png b/vector/src/main/res/drawable-xxxhdpi/riot_splash_3_red.png
deleted file mode 100644
index 90fed3ffd8..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/riot_splash_3_red.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/riot_splash_white.png b/vector/src/main/res/drawable-xxxhdpi/riot_splash_white.png
new file mode 100644
index 0000000000..101434496b
Binary files /dev/null and b/vector/src/main/res/drawable-xxxhdpi/riot_splash_white.png differ
diff --git a/vector/src/main/res/drawable/bg_group_item.xml b/vector/src/main/res/drawable/bg_group_item.xml
index 221150eb8c..9e48ebc725 100644
--- a/vector/src/main/res/drawable/bg_group_item.xml
+++ b/vector/src/main/res/drawable/bg_group_item.xml
@@ -3,7 +3,7 @@
 
     <item android:state_checked="true">
         <shape>
-            <solid android:color="#10000000" />
+            <solid android:color="@android:color/transparent" />
             <corners android:radius="4dp" />
         </shape>
     </item>
diff --git a/vector/src/main/res/drawable/element_logo_green.xml b/vector/src/main/res/drawable/element_logo_green.xml
new file mode 100644
index 0000000000..e9b119c969
--- /dev/null
+++ b/vector/src/main/res/drawable/element_logo_green.xml
@@ -0,0 +1,22 @@
+<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/vector/src/main/res/drawable/element_logotype.xml b/vector/src/main/res/drawable/element_logotype.xml
new file mode 100644
index 0000000000..0419447b32
--- /dev/null
+++ b/vector/src/main/res/drawable/element_logotype.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="155dp"
+    android:height="33dp"
+    android:viewportWidth="155"
+    android:viewportHeight="33">
+  <path
+      android:pathData="M21.533,22.855H4.969C5.165,24.595 5.794,25.985 6.856,27.023C7.918,28.034 9.316,28.539 11.05,28.539C12.196,28.539 13.23,28.258 14.153,27.697C15.075,27.135 15.732,26.378 16.124,25.423H21.156C20.485,27.641 19.227,29.437 17.382,30.812C15.564,32.16 13.412,32.833 10.924,32.833C7.681,32.833 5.053,31.753 3.04,29.591C1.055,27.43 0.063,24.694 0.063,21.381C0.063,18.153 1.069,15.445 3.082,13.255C5.095,11.066 7.695,9.972 10.882,9.972C14.069,9.972 16.641,11.052 18.598,13.213C20.583,15.347 21.575,18.041 21.575,21.297L21.533,22.855ZM10.882,14.056C9.316,14.056 8.016,14.519 6.982,15.445C5.947,16.371 5.304,17.606 5.053,19.15H16.627C16.403,17.606 15.788,16.371 14.782,15.445C13.775,14.519 12.475,14.056 10.882,14.056Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M25.009,25.802V0.751H30V25.886C30,27.009 30.615,27.57 31.845,27.57L32.725,27.528V32.286C32.25,32.37 31.747,32.412 31.216,32.412C29.063,32.412 27.483,31.865 26.477,30.77C25.499,29.676 25.009,28.02 25.009,25.802Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M55.966,22.855H39.401C39.597,24.595 40.226,25.985 41.289,27.023C42.351,28.034 43.749,28.539 45.482,28.539C46.628,28.539 47.663,28.258 48.585,27.697C49.508,27.135 50.165,26.378 50.556,25.423H55.588C54.917,27.641 53.659,29.437 51.814,30.812C49.997,32.16 47.844,32.833 45.356,32.833C42.113,32.833 39.485,31.753 37.472,29.591C35.487,27.43 34.495,24.694 34.495,21.381C34.495,18.153 35.501,15.445 37.514,13.255C39.527,11.066 42.127,9.972 45.314,9.972C48.501,9.972 51.073,11.052 53.03,13.213C55.015,15.347 56.008,18.041 56.008,21.297L55.966,22.855ZM45.314,14.056C43.749,14.056 42.449,14.519 41.414,15.445C40.38,16.371 39.737,17.606 39.485,19.15H51.059C50.836,17.606 50.221,16.371 49.214,15.445C48.208,14.519 46.908,14.056 45.314,14.056Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M78.48,19.781V32.328H73.49V19.234C73.49,15.922 72.12,14.266 69.38,14.266C67.899,14.266 66.711,14.743 65.816,15.698C64.949,16.652 64.516,17.957 64.516,19.613V32.328H59.526V10.477H64.138V13.382C64.67,12.399 65.48,11.585 66.571,10.94C67.661,10.294 69.017,9.972 70.638,9.972C73.658,9.972 75.838,11.122 77.18,13.424C79.025,11.122 81.486,9.972 84.561,9.972C87.105,9.972 89.062,10.771 90.432,12.371C91.802,13.943 92.487,16.02 92.487,18.603V32.328H87.496V19.234C87.496,15.922 86.126,14.266 83.387,14.266C81.877,14.266 80.675,14.757 79.78,15.74C78.914,16.694 78.48,18.041 78.48,19.781Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M117.304,22.855H100.739C100.935,24.595 101.564,25.985 102.627,27.023C103.689,28.034 105.087,28.539 106.82,28.539C107.966,28.539 109.001,28.258 109.923,27.697C110.846,27.135 111.503,26.378 111.894,25.423H116.926C116.255,27.641 114.997,29.437 113.152,30.812C111.335,32.16 109.182,32.833 106.694,32.833C103.451,32.833 100.823,31.753 98.811,29.591C96.826,27.43 95.833,24.694 95.833,21.381C95.833,18.153 96.84,15.445 98.852,13.255C100.865,11.066 103.465,9.972 106.652,9.972C109.839,9.972 112.411,11.052 114.368,13.213C116.353,15.347 117.346,18.041 117.346,21.297L117.304,22.855ZM106.652,14.056C105.087,14.056 103.787,14.519 102.752,15.445C101.718,16.371 101.075,17.606 100.823,19.15H112.397C112.174,17.606 111.559,16.371 110.552,15.445C109.546,14.519 108.246,14.056 106.652,14.056Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M125.477,10.477V13.382C125.98,12.427 126.804,11.628 127.951,10.982C129.125,10.308 130.537,9.972 132.186,9.972C134.758,9.972 136.743,10.757 138.141,12.329C139.567,13.901 140.28,15.992 140.28,18.603V32.328H135.289V19.234C135.289,17.69 134.926,16.483 134.199,15.613C133.5,14.715 132.424,14.266 130.97,14.266C129.376,14.266 128.118,14.743 127.196,15.698C126.301,16.652 125.854,17.971 125.854,19.655V32.328H120.864V10.477H125.477Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M154.854,27.865V32.202C154.239,32.37 153.372,32.454 152.254,32.454C148.004,32.454 145.88,30.307 145.88,26.013V14.476H142.567V10.477H145.88V4.793H150.87V10.477H154.938V14.476H150.87V25.507C150.87,27.22 151.681,28.076 153.302,28.076L154.854,27.865Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_attachment.xml b/vector/src/main/res/drawable/ic_attachment.xml
index e54b93025b..944998c1cd 100644
--- a/vector/src/main/res/drawable/ic_attachment.xml
+++ b/vector/src/main/res/drawable/ic_attachment.xml
@@ -1,14 +1,7 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="21dp"
-    android:height="22dp"
-    android:viewportWidth="21"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M19.468,10.571l-8.73,8.753a5.693,5.693 0,0 1,-8.066 0,5.728 5.728,0 0,1 0,-8.086l8.73,-8.752a3.795,3.795 0,0 1,5.378 0,3.818 3.818,0 0,1 0,5.39L8.04,16.63a1.898,1.898 0,0 1,-2.689 0,1.91 1.91,0 0,1 0,-2.696l8.065,-8.076"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff"
+        android:pathData="M21,12C21,16.9706 16.9706,21 12,21C7.0294,21 3,16.9706 3,12C3,7.0294 7.0294,3 12,3C16.9706,3 21,7.0294 21,12ZM8,10C6.8954,10 6,10.8954 6,12C6,13.1046 6.8954,14 8,14H10V16C10,17.1046 10.8954,18 12,18C13.1046,18 14,17.1046 14,16V14H16C17.1046,14 18,13.1046 18,12C18,10.8954 17.1046,10 16,10H14V8C14,6.8954 13.1046,6 12,6C10.8954,6 10,6.8954 10,8V10H8Z"
+        android:strokeColor="#ffffff" android:strokeWidth="2"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_call_end.xml b/vector/src/main/res/drawable/ic_call_end.xml
index 07f7e01351..0e80a323d8 100644
--- a/vector/src/main/res/drawable/ic_call_end.xml
+++ b/vector/src/main/res/drawable/ic_call_end.xml
@@ -1,14 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M5.2415,18.995L3.2268,16.7576C2.8469,16.3391 2.6614,15.7796 2.7158,15.2164C2.7702,14.6532 3.0596,14.1387 3.5127,13.799C6.0368,11.9778 8.9518,10.773 12.0235,10.2815C14.8601,9.8008 17.7666,9.9501 20.5365,10.719C23.5514,11.5274 26.332,13.0348 28.6531,15.1192C29.0664,15.5022 29.2993,16.0416 29.2949,16.6055C29.2905,17.1694 29.0492,17.706 28.6301,18.0841L26.3882,20.1028C25.6447,20.7857 24.5111,20.8127 23.7386,20.1659C22.9992,19.535 22.1907,18.99 21.3284,18.5412C20.6322,18.181 20.2102,17.4482 20.2477,16.6648L20.3438,14.863C17.5987,13.9538 14.6576,13.8027 11.8307,14.4256L11.7346,16.2273C11.6884,17.0104 11.1907,17.6959 10.46,17.9828C9.5547,18.3408 8.6926,18.8 7.8901,19.3516C7.0434,19.9224 5.9044,19.7691 5.2415,18.995Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
+      android:pathData="M12.5084,8.2565C10.8211,8.1916 7.3514,8.6295 6.5078,8.8513C6.4579,8.8645 6.4004,8.8791 6.3362,8.8955C5.041,9.2261 0.9827,10.2618 0.5442,13.5436C0.2045,16.0862 1.9058,16.8558 2.7562,16.7386C3.3448,16.6648 5.0301,16.3983 6.5872,16.1189C8.1163,15.8446 8.1155,14.8359 8.115,14.1538C8.115,14.1413 8.115,14.1288 8.115,14.1165L8.115,12.7453C8.115,12.3961 8.4431,12.1942 8.8958,12.1396C10.4982,11.922 11.8359,11.9213 12.5055,11.9213L12.5112,11.9213C13.1807,11.9213 14.5018,11.922 16.1042,12.1396C16.5569,12.1942 16.885,12.3961 16.885,12.7453L16.885,14.1165C16.885,14.1289 16.885,14.1413 16.885,14.1538C16.8845,14.8359 16.8837,15.8446 18.4128,16.119C19.9699,16.3983 21.6552,16.6648 22.2438,16.7386C23.0942,16.8558 24.7955,16.0862 24.4558,13.5436C24.0173,10.2618 19.959,9.2261 18.6638,8.8955C18.5996,8.8791 18.5421,8.8645 18.4922,8.8513C17.6487,8.6295 14.1956,8.1916 12.5084,8.2565Z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_delete.xml b/vector/src/main/res/drawable/ic_delete.xml
index b740db3cff..a13389855b 100644
--- a/vector/src/main/res/drawable/ic_delete.xml
+++ b/vector/src/main/res/drawable/ic_delete.xml
@@ -1,22 +1,18 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M3.222,1L18.778,1A2.222,2.222 0,0 1,21 3.222L21,18.778A2.222,2.222 0,0 1,18.778 21L3.222,21A2.222,2.222 0,0 1,1 18.778L1,3.222A2.222,2.222 0,0 1,3.222 1z"
-      android:strokeLineJoin="round"
+      android:pathData="M6.5,6.5L18.5,18.5"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
+      android:strokeColor="#000000"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M7.667,7.667l6.666,6.666M14.333,7.667l-6.666,6.666"
-      android:strokeLineJoin="round"
+      android:pathData="M18.5,6.5L6.5,18.5"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
+      android:strokeColor="#000000"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_eye.xml b/vector/src/main/res/drawable/ic_eye.xml
new file mode 100644
index 0000000000..976a023268
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_eye.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.7361,9.9197C23.6693,11.1729 23.6895,12.8384 22.7728,14.1036C21.0553,16.4739 17.6416,20 12.5317,20C7.4217,20 4.008,16.4739 2.2906,14.1036C1.3738,12.8384 1.394,11.1729 2.3273,9.9197C4.0926,7.5494 7.5651,4 12.5317,4C17.4982,4 20.9708,7.5494 22.7361,9.9197ZM17.8334,12C17.8334,14.9455 15.4456,17.3333 12.5001,17.3333C9.5546,17.3333 7.1668,14.9455 7.1668,12C7.1668,9.0545 9.5546,6.6667 12.5001,6.6667C15.4456,6.6667 17.8334,9.0545 17.8334,12ZM12.5001,14.6667C13.9729,14.6667 15.1668,13.4728 15.1668,12C15.1668,10.5272 13.9729,9.3333 12.5001,9.3333C11.0274,9.3333 9.8335,10.5272 9.8335,12C9.8335,13.4728 11.0274,14.6667 12.5001,14.6667Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_eye_closed.xml b/vector/src/main/res/drawable/ic_eye_closed.xml
new file mode 100644
index 0000000000..5d13f0615d
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_eye_closed.xml
@@ -0,0 +1,7 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M5.4447,6.2731C3.8736,7.4199 2.6604,8.8011 1.8273,9.9197C0.894,11.1729 0.8738,12.8384 1.7906,14.1036C3.508,16.4739 6.9217,20 12.0317,20C14.2012,20 16.065,19.3644 17.623,18.4514L15.3344,16.1628C14.4212,16.8952 13.2618,17.3333 12.0002,17.3333C9.0546,17.3333 6.6668,14.9455 6.6668,12C6.6668,10.7383 7.1049,9.5789 7.8373,8.6657L5.4447,6.2731ZM17.3119,12.4834C17.3262,12.3242 17.3335,12.163 17.3335,12C17.3335,9.0545 14.9457,6.6667 12.0002,6.6667C11.8372,6.6667 11.6759,6.674 11.5167,6.6883L9.2201,4.3917C10.0958,4.1434 11.0336,4 12.0317,4C16.9982,4 20.4708,7.5494 22.2361,9.9197C23.1693,11.1729 23.1895,12.8384 22.2728,14.1036C21.8639,14.6678 21.359,15.2975 20.758,15.9296L17.3119,12.4834ZM9.7461,10.5745C9.4848,10.9868 9.3335,11.4757 9.3335,12C9.3335,13.4728 10.5274,14.6667 12.0002,14.6667C12.5244,14.6667 13.0133,14.5154 13.4257,14.2541L9.7461,10.5745Z"/>
+    <path android:fillColor="#00000000" android:pathData="M1,1L23,23"
+        android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_fab_add_chat.xml b/vector/src/main/res/drawable/ic_fab_add_chat.xml
index 3e1b9a0eb1..b823134db0 100644
--- a/vector/src/main/res/drawable/ic_fab_add_chat.xml
+++ b/vector/src/main/res/drawable/ic_fab_add_chat.xml
@@ -1,21 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="34dp"
-    android:height="20dp"
-    android:viewportWidth="34"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M19,9.5a8.38,8.38 0,0 1,-0.9 3.8,8.5 8.5,0 0,1 -7.6,4.7 8.38,8.38 0,0 1,-3.8 -0.9L1,19l1.9,-5.7A8.38,8.38 0,0 1,2 9.5a8.5,8.5 0,0 1,4.7 -7.6,8.38 8.38,0 0,1 3.8,-0.9h0.5a8.48,8.48 0,0 1,8 8v0.5z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#FFF"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M28.5,6v8M24.5,10h8"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#FFF"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="36dp"
+    android:viewportHeight="36" android:viewportWidth="37"
+    android:width="37dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M12.283,27.4392C17.649,27.4392 21.9991,23.0875 21.9991,17.7196C21.9991,12.3516 17.649,8 12.283,8C6.917,8 2.567,12.3516 2.567,17.7196C2.567,19.2233 2.9083,20.6472 3.5177,21.9181L2.0457,26.7041C1.8091,27.4733 2.5317,28.1926 3.2998,27.9525L8.0461,26.4688C9.3265,27.0905 10.7641,27.4392 12.283,27.4392Z"/>
+    <path android:fillColor="#00000000" android:pathData="M27,18H35"
+        android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2.5"/>
+    <path android:fillColor="#00000000" android:pathData="M31,14L31,22"
+        android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2.5"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_fab_add_room.xml b/vector/src/main/res/drawable/ic_fab_add_room.xml
index 630150fe32..84cc422acc 100644
--- a/vector/src/main/res/drawable/ic_fab_add_room.xml
+++ b/vector/src/main/res/drawable/ic_fab_add_room.xml
@@ -1,21 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="20dp"
-    android:viewportWidth="32"
-    android:viewportHeight="20">
+    android:width="37dp"
+    android:height="36dp"
+    android:viewportWidth="37"
+    android:viewportHeight="36">
   <path
-      android:pathData="M1,7h16M1,13h16M7,1L5,19M13,1l-2,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
+      android:pathData="M27,18H35"
+      android:strokeWidth="2.5"
       android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#FFF"
+      android:strokeColor="#ffffff"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M26.5,6v8M22.5,10h8"
-      android:strokeWidth="2"
+      android:pathData="M31,14L31,22"
+      android:strokeWidth="2.5"
       android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#FFF"
+      android:strokeColor="#ffffff"
       android:strokeLineCap="round"/>
+  <path
+      android:pathData="M9.722,8.7395C9.8165,7.8766 9.1808,7.1019 8.3022,7.0091C7.4237,6.9163 6.6349,7.5406 6.5404,8.4035L6.1042,12.3879H3.4003C2.5166,12.3879 1.8003,13.0914 1.8003,13.9593C1.8003,14.8272 2.5166,15.5307 3.4003,15.5307H5.7601L5.2194,20.4694H2.6C1.7163,20.4694 1,21.1729 1,22.0408C1,22.9087 1.7163,23.6122 2.6,23.6122H4.8753L4.4759,27.2605C4.3814,28.1234 5.0171,28.8981 5.8956,28.9909C6.7742,29.0836 7.563,28.4593 7.6575,27.5965L8.0937,23.6122H12.8755L12.4761,27.2605C12.3816,28.1233 13.0173,28.8981 13.8958,28.9909C14.7744,29.0836 15.5632,28.4593 15.6577,27.5965L16.0939,23.6122H19.3997C20.2834,23.6122 20.9997,22.9087 20.9997,22.0408C20.9997,21.1729 20.2834,20.4694 19.3997,20.4694H16.438L16.9787,15.5307H19.4C20.2837,15.5307 21,14.8272 21,13.9593C21,13.0914 20.2837,12.3879 19.4,12.3879H17.3228L17.7222,8.7395C17.8167,7.8766 17.181,7.1019 16.3024,7.0091C15.4239,6.9163 14.635,7.5406 14.5406,8.4035L14.1044,12.3879H9.3226L9.722,8.7395ZM13.2196,20.4694L13.7603,15.5307H8.9785L8.4378,20.4694H13.2196Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_filter.xml b/vector/src/main/res/drawable/ic_filter.xml
index 7d6f284bab..740585b17e 100644
--- a/vector/src/main/res/drawable/ic_filter.xml
+++ b/vector/src/main/res/drawable/ic_filter.xml
@@ -7,14 +7,14 @@
       android:pathData="M4,6.5h16"
       android:strokeWidth="1.8"
       android:fillColor="#00000000"
-      android:strokeColor="#03B381"
+      android:strokeColor="#9E9E9E"
       android:fillType="evenOdd"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,12.5h12M9,18.5h6"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#03B381"
+      android:strokeColor="#9E9E9E"
       android:fillType="evenOdd"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_home_bottom_catchup.xml b/vector/src/main/res/drawable/ic_home_bottom_catchup.xml
index f59c2d64c2..1091bb04c7 100644
--- a/vector/src/main/res/drawable/ic_home_bottom_catchup.xml
+++ b/vector/src/main/res/drawable/ic_home_bottom_catchup.xml
@@ -1,22 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
+    android:width="18dp"
     android:height="22dp"
-    android:viewportWidth="20"
+    android:viewportWidth="18"
     android:viewportHeight="22">
   <path
-      android:pathData="M1,8l9,-7 9,7v11a2,2 0,0 1,-2 2H3a2,2 0,0 1,-2 -2V8z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M7,21V11h6v10"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M0,18.9226V8.7056C0,8.1252 0.2521,7.5734 0.6909,7.1935L7.6909,1.1333C8.4424,0.4827 9.5576,0.4827 10.3091,1.1333L17.3091,7.1935C17.7479,7.5734 18,8.1241 18,8.7045V18.9645C18,20.6363 16.6355,21.9833 14.9638,21.9686C11.8814,21.9416 7.015,21.9124 3.0756,21.95C1.3889,21.9661 0,20.6094 0,18.9226Z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_home_bottom_chat.xml b/vector/src/main/res/drawable/ic_home_bottom_chat.xml
index 2f78524283..b2ec095ece 100644
--- a/vector/src/main/res/drawable/ic_home_bottom_chat.xml
+++ b/vector/src/main/res/drawable/ic_home_bottom_chat.xml
@@ -1,14 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M19,9.5a8.38,8.38 0,0 1,-0.9 3.8,8.5 8.5,0 0,1 -7.6,4.7 8.38,8.38 0,0 1,-3.8 -0.9L1,19l1.9,-5.7A8.38,8.38 0,0 1,2 9.5a8.5,8.5 0,0 1,4.7 -7.6,8.38 8.38,0 0,1 3.8,-0.9h0.5a8.48,8.48 0,0 1,8 8v0.5z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="20dp"
+    android:viewportHeight="20" android:viewportWidth="20"
+    android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M10.283,19.4392C15.649,19.4392 19.9991,15.0875 19.9991,9.7196C19.9991,4.3516 15.649,0 10.283,0C4.917,0 0.567,4.3516 0.567,9.7196C0.567,11.2233 0.9083,12.6472 1.5177,13.9181L0.0457,18.7041C-0.1909,19.4733 0.5317,20.1926 1.2998,19.9525L6.0461,18.4688C7.3266,19.0905 8.7641,19.4392 10.283,19.4392Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_home_bottom_group.xml b/vector/src/main/res/drawable/ic_home_bottom_group.xml
index 29be415bf5..d49f07d936 100644
--- a/vector/src/main/res/drawable/ic_home_bottom_group.xml
+++ b/vector/src/main/res/drawable/ic_home_bottom_group.xml
@@ -1,14 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="20dp"
-    android:viewportWidth="18"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M1,7h16M1,13h16M7,1L5,19M13,1l-2,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="22dp"
+    android:viewportHeight="22" android:viewportWidth="22"
+    android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M11,22C17.0751,22 22,17.0751 22,11C22,4.9249 17.0751,0 11,0C4.9249,0 0,4.9249 0,11C0,17.0751 4.9249,22 11,22ZM9.2253,4.5887C9.7286,4.6428 10.0928,5.0947 10.0387,5.5981L9.8098,7.7263H12.5493L12.7992,5.4021C12.8533,4.8987 13.3053,4.5346 13.8086,4.5887C14.312,4.6428 14.6762,5.0947 14.622,5.5981L14.3932,7.7263H15.5833C16.0896,7.7263 16.5,8.1367 16.5,8.643C16.5,9.1493 16.0896,9.5597 15.5833,9.5597H14.1961L13.8863,12.4406H15.5833C16.0896,12.4406 16.5,12.851 16.5,13.3573C16.5,13.8635 16.0896,14.2739 15.5833,14.2739H13.6892L13.4393,16.5981C13.3851,17.1015 12.9332,17.4656 12.4298,17.4115C11.9265,17.3574 11.5623,16.9055 11.6164,16.4021L11.8453,14.2739H9.1058L8.8559,16.5981C8.8018,17.1015 8.3498,17.4656 7.8465,17.4115C7.3431,17.3574 6.979,16.9055 7.0331,16.4021L7.2619,14.2739H5.9583C5.4521,14.2739 5.0416,13.8635 5.0416,13.3573C5.0416,12.851 5.4521,12.4406 5.9583,12.4406H7.459L7.7688,9.5597H6.4167C5.9104,9.5597 5.5,9.1493 5.5,8.643C5.5,8.1367 5.9104,7.7263 6.4167,7.7263H7.966L8.2159,5.4021C8.27,4.8987 8.7219,4.5346 9.2253,4.5887ZM12.3522,9.5597L12.0424,12.4406H9.3029L9.6127,9.5597H12.3522Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_launcher_background.xml b/vector/src/main/res/drawable/ic_launcher_background.xml
index e6850c4b9e..f58c9aeb53 100644
--- a/vector/src/main/res/drawable/ic_launcher_background.xml
+++ b/vector/src/main/res/drawable/ic_launcher_background.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="108">
   <path
       android:pathData="m0,0h108v108h-108z"
-      android:fillColor="#27303a"
+      android:fillColor="#0DBD8B"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_login_splash_lock.xml b/vector/src/main/res/drawable/ic_login_splash_lock.xml
index 26470cefce..2b0a912ac7 100644
--- a/vector/src/main/res/drawable/ic_login_splash_lock.xml
+++ b/vector/src/main/res/drawable/ic_login_splash_lock.xml
@@ -1,22 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="22dp"
-    android:viewportWidth="20"
-    android:viewportHeight="22">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M3,10L17,10A2,2 0,0 1,19 12L19,19A2,2 0,0 1,17 21L3,21A2,2 0,0 1,1 19L1,12A2,2 0,0 1,3 10z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#61708B"
-      android:strokeLineCap="round"/>
+      android:pathData="M3.0001,12.8C3.0001,11.1431 4.3432,9.8 6.0001,9.8H18.0001C19.6569,9.8 21.0001,11.1431 21.0001,12.8V19.8C21.0001,21.4569 19.6569,22.8 18.0001,22.8H6.0001C4.3432,22.8 3.0001,21.4569 3.0001,19.8V12.8Z"
+      android:fillColor="#ffffff"/>
   <path
-      android:pathData="M5,10L5,6a5,5 0,1 1,10 0v4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
+      android:pathData="M7,6.5C7,4.2909 8.7909,2.5 11,2.5H13C15.2091,2.5 17,4.2909 17,6.5V11.5C17,13.7091 15.2091,15.5 13,15.5H11C8.7909,15.5 7,13.7091 7,11.5V6.5Z"
+      android:strokeWidth="3"
       android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#61708B"
-      android:strokeLineCap="round"/>
+      android:strokeColor="#ffffff"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_login_splash_message_circle.xml b/vector/src/main/res/drawable/ic_login_splash_message_circle.xml
index 81b5e9476a..8f2c6f7f39 100644
--- a/vector/src/main/res/drawable/ic_login_splash_message_circle.xml
+++ b/vector/src/main/res/drawable/ic_login_splash_message_circle.xml
@@ -1,14 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M19,9.5a8.38,8.38 0,0 1,-0.9 3.8,8.5 8.5,0 0,1 -7.6,4.7 8.38,8.38 0,0 1,-3.8 -0.9L1,19l1.9,-5.7A8.38,8.38 0,0 1,2 9.5a8.5,8.5 0,0 1,4.7 -7.6,8.38 8.38,0 0,1 3.8,-0.9h0.5a8.48,8.48 0,0 1,8 8v0.5z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#61708B"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M12.283,21.4392C17.649,21.4392 21.9991,17.0875 21.9991,11.7196C21.9991,6.3516 17.649,2 12.283,2C6.917,2 2.567,6.3516 2.567,11.7196C2.567,13.2233 2.9083,14.6472 3.5177,15.9181L2.0457,20.7041C1.8091,21.4733 2.5317,22.1926 3.2998,21.9525L8.0461,20.4688C9.3265,21.0905 10.7641,21.4392 12.283,21.4392Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_login_splash_sliders.xml b/vector/src/main/res/drawable/ic_login_splash_sliders.xml
index b7c850eea7..eb4c8fd3a4 100644
--- a/vector/src/main/res/drawable/ic_login_splash_sliders.xml
+++ b/vector/src/main/res/drawable/ic_login_splash_sliders.xml
@@ -1,14 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    android:height="20dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="20">
+    android:viewportHeight="24">
   <path
-      android:pathData="M4,19v-7M4,8V1M12,19v-9M12,6V1M20,19v-5M20,10V1M1,12h6M9,6h6M17,14h6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#61708B"
-      android:strokeLineCap="round"/>
+      android:pathData="M8,4C3.5817,4 0,7.5817 0,12C0,16.4183 3.5817,20 8,20H16C20.4183,20 24,16.4183 24,12C24,7.5817 20.4183,4 16,4H8ZM13,12C13,14.7614 10.7614,17 8,17C5.2386,17 3,14.7614 3,12C3,9.2386 5.2386,7 8,7C10.7614,7 13,9.2386 13,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml b/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml
new file mode 100644
index 0000000000..89824b8168
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="208dp"
+    android:height="20dp"
+    android:viewportWidth="334"
+    android:viewportHeight="32">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M56.28,17.24H46.168C46.287,18.298 46.671,19.143 47.32,19.774C47.968,20.389 48.822,20.696 49.88,20.696C50.58,20.696 51.211,20.525 51.774,20.184C52.338,19.843 52.739,19.382 52.978,18.802H56.05C55.64,20.15 54.872,21.242 53.746,22.078C52.636,22.898 51.322,23.307 49.803,23.307C47.823,23.307 46.219,22.65 44.99,21.336C43.779,20.022 43.173,18.358 43.173,16.344C43.173,14.381 43.787,12.734 45.016,11.403C46.245,10.072 47.832,9.406 49.778,9.406C51.723,9.406 53.293,10.064 54.488,11.378C55.7,12.675 56.306,14.313 56.306,16.293L56.28,17.24ZM49.778,11.89C48.822,11.89 48.028,12.171 47.397,12.734C46.765,13.298 46.373,14.049 46.219,14.987H53.285C53.148,14.049 52.773,13.298 52.158,12.734C51.544,12.171 50.75,11.89 49.778,11.89ZM58.402,19.032V3.8H61.448V19.083C61.448,19.766 61.824,20.107 62.575,20.107L63.112,20.082V22.974C62.822,23.026 62.515,23.051 62.191,23.051C60.877,23.051 59.912,22.718 59.298,22.053C58.701,21.387 58.402,20.38 58.402,19.032ZM77.3,17.24H67.188C67.307,18.298 67.691,19.143 68.34,19.774C68.989,20.389 69.842,20.696 70.9,20.696C71.6,20.696 72.231,20.525 72.794,20.184C73.358,19.843 73.759,19.382 73.998,18.802H77.07C76.66,20.15 75.892,21.242 74.766,22.078C73.656,22.898 72.342,23.307 70.823,23.307C68.843,23.307 67.239,22.65 66.01,21.336C64.799,20.022 64.193,18.358 64.193,16.344C64.193,14.381 64.807,12.734 66.036,11.403C67.265,10.072 68.852,9.406 70.798,9.406C72.743,9.406 74.313,10.064 75.508,11.378C76.72,12.675 77.326,14.313 77.326,16.293L77.3,17.24ZM70.798,11.89C69.842,11.89 69.048,12.171 68.417,12.734C67.785,13.298 67.393,14.049 67.239,14.987H74.305C74.168,14.049 73.793,13.298 73.178,12.734C72.564,12.171 71.77,11.89 70.798,11.89ZM91.044,15.371V23H87.998V15.038C87.998,13.024 87.162,12.018 85.489,12.018C84.585,12.018 83.859,12.308 83.313,12.888C82.784,13.468 82.52,14.262 82.52,15.269V23H79.473V9.714H82.289V11.48C82.613,10.883 83.108,10.388 83.774,9.995C84.44,9.603 85.267,9.406 86.257,9.406C88.1,9.406 89.432,10.106 90.251,11.506C91.377,10.106 92.879,9.406 94.756,9.406C96.309,9.406 97.504,9.893 98.34,10.866C99.177,11.821 99.595,13.084 99.595,14.654V23H96.548V15.038C96.548,13.024 95.712,12.018 94.04,12.018C93.118,12.018 92.384,12.316 91.838,12.914C91.309,13.494 91.044,14.313 91.044,15.371ZM114.745,17.24H104.633C104.752,18.298 105.136,19.143 105.785,19.774C106.433,20.389 107.287,20.696 108.345,20.696C109.045,20.696 109.676,20.525 110.239,20.184C110.803,19.843 111.204,19.382 111.443,18.802H114.515C114.105,20.15 113.337,21.242 112.211,22.078C111.101,22.898 109.787,23.307 108.268,23.307C106.288,23.307 104.684,22.65 103.455,21.336C102.244,20.022 101.638,18.358 101.638,16.344C101.638,14.381 102.252,12.734 103.481,11.403C104.71,10.072 106.297,9.406 108.243,9.406C110.188,9.406 111.758,10.064 112.953,11.378C114.165,12.675 114.771,14.313 114.771,16.293L114.745,17.24ZM108.243,11.89C107.287,11.89 106.493,12.171 105.862,12.734C105.23,13.298 104.838,14.049 104.684,14.987H111.75C111.613,14.049 111.238,13.298 110.623,12.734C110.009,12.171 109.215,11.89 108.243,11.89ZM119.734,9.714V11.48C120.041,10.9 120.545,10.413 121.245,10.021C121.961,9.611 122.823,9.406 123.83,9.406C125.4,9.406 126.612,9.884 127.465,10.84C128.336,11.796 128.771,13.067 128.771,14.654V23H125.725V15.038C125.725,14.1 125.503,13.366 125.059,12.837C124.632,12.291 123.975,12.018 123.088,12.018C122.115,12.018 121.347,12.308 120.784,12.888C120.238,13.468 119.965,14.27 119.965,15.294V23H116.918V9.714H119.734ZM137.668,20.286V22.923C137.292,23.026 136.763,23.077 136.081,23.077C133.487,23.077 132.19,21.771 132.19,19.16V12.146H130.167V9.714H132.19V6.258H135.236V9.714H137.719V12.146H135.236V18.853C135.236,19.894 135.731,20.414 136.721,20.414L137.668,20.286ZM156.557,15.397V23H154.739V15.038C154.739,13.861 154.466,12.939 153.92,12.274C153.391,11.591 152.572,11.25 151.462,11.25C150.37,11.25 149.474,11.608 148.774,12.325C148.075,13.042 147.725,14.014 147.725,15.243V23H145.907V9.97H147.648V11.966C148.484,10.43 149.858,9.662 151.77,9.662C153.835,9.662 155.251,10.499 156.019,12.171C156.429,11.472 157.026,10.883 157.811,10.405C158.596,9.91 159.526,9.662 160.602,9.662C162.12,9.662 163.29,10.14 164.109,11.096C164.945,12.035 165.363,13.229 165.363,14.68V23H163.546V15.038C163.546,13.878 163.272,12.956 162.726,12.274C162.197,11.591 161.387,11.25 160.294,11.25C159.219,11.25 158.323,11.608 157.606,12.325C156.907,13.042 156.557,14.066 156.557,15.397ZM178.283,16.805C175.945,16.805 174.349,16.856 173.496,16.958C172.66,17.044 172.045,17.189 171.653,17.394C170.953,17.786 170.603,18.418 170.603,19.288C170.603,20.961 171.593,21.797 173.573,21.797C175.092,21.797 176.252,21.455 177.054,20.773C177.874,20.09 178.283,19.177 178.283,18.034V16.805ZM173.368,23.307C171.883,23.307 170.748,22.949 169.963,22.232C169.195,21.498 168.811,20.534 168.811,19.339C168.811,18.554 169.016,17.854 169.426,17.24C169.852,16.626 170.432,16.173 171.166,15.883C171.781,15.644 172.574,15.491 173.547,15.422C174.52,15.337 176.099,15.294 178.283,15.294V14.45C178.283,12.299 177.054,11.224 174.597,11.224C172.48,11.224 171.252,12.086 170.91,13.81H169.144C169.332,12.547 169.869,11.54 170.757,10.789C171.661,10.038 172.967,9.662 174.674,9.662C176.5,9.662 177.856,10.089 178.744,10.942C179.648,11.796 180.101,12.973 180.101,14.475V23H178.36V21.106C177.455,22.573 175.791,23.307 173.368,23.307ZM189.481,21.285V22.923C189.174,23.008 188.713,23.051 188.099,23.051C185.846,23.051 184.72,21.865 184.72,19.493V11.506H182.237V9.97H184.72V6.258H186.537V9.97H189.533V11.506H186.537V19.365C186.537,20.73 187.135,21.413 188.329,21.413L189.481,21.285ZM198.806,9.867V11.582C198.601,11.565 198.388,11.557 198.166,11.557C197.005,11.557 196.067,11.907 195.35,12.606C194.633,13.289 194.275,14.288 194.275,15.602V23H192.457V9.97H194.198V11.992C194.505,11.429 195.009,10.934 195.708,10.507C196.408,10.064 197.296,9.842 198.371,9.842L198.806,9.867ZM199.768,11.506V9.97H203.736V23H201.919V11.506H199.768ZM203.762,6.411C203.523,6.633 203.216,6.744 202.84,6.744C202.465,6.744 202.149,6.633 201.893,6.411C201.654,6.172 201.535,5.874 201.535,5.515V5.413C201.535,5.225 201.569,5.063 201.637,4.926C201.876,4.431 202.277,4.184 202.84,4.184C203.216,4.184 203.523,4.312 203.762,4.568C204.018,4.807 204.146,5.114 204.146,5.49C204.146,5.865 204.018,6.172 203.762,6.411ZM219.113,9.97L213.942,16.395L219.292,23H217.014L212.866,17.778L208.719,23H206.492L211.791,16.421L206.62,9.97H208.873L212.892,15.013L216.886,9.97H219.113ZM232.855,23.307C231.097,23.307 229.783,22.898 228.913,22.078C228.059,21.242 227.59,20.192 227.505,18.93H229.348C229.416,19.8 229.74,20.483 230.321,20.978C230.918,21.472 231.763,21.72 232.855,21.72C233.93,21.72 234.766,21.524 235.364,21.131C235.978,20.722 236.285,20.184 236.285,19.518C236.285,18.836 236.004,18.332 235.441,18.008C234.894,17.667 234.229,17.436 233.444,17.317C232.659,17.197 231.865,17.052 231.063,16.882C230.278,16.711 229.604,16.353 229.041,15.806C228.494,15.26 228.221,14.492 228.221,13.502C228.221,12.444 228.657,11.54 229.527,10.789C230.397,10.038 231.575,9.662 233.06,9.662C234.698,9.662 235.91,10.08 236.695,10.917C237.48,11.753 237.924,12.709 238.026,13.784H236.209C236.123,13.033 235.816,12.427 235.287,11.966C234.758,11.488 233.998,11.25 233.009,11.25C232.036,11.25 231.285,11.454 230.756,11.864C230.244,12.274 229.988,12.794 229.988,13.426C229.988,13.989 230.184,14.432 230.577,14.757C230.986,15.081 231.49,15.294 232.087,15.397C232.684,15.482 233.324,15.602 234.007,15.755C234.707,15.909 235.355,16.08 235.953,16.267C236.55,16.455 237.045,16.822 237.437,17.368C237.847,17.914 238.052,18.614 238.052,19.467C238.052,20.525 237.599,21.43 236.695,22.181C235.807,22.932 234.527,23.307 232.855,23.307ZM253.256,17.01H242.427C242.512,18.375 242.973,19.493 243.809,20.363C244.646,21.234 245.729,21.669 247.061,21.669C248.033,21.669 248.887,21.421 249.621,20.926C250.354,20.414 250.866,19.749 251.157,18.93H253.051C252.658,20.227 251.933,21.285 250.875,22.104C249.817,22.906 248.537,23.307 247.035,23.307C245.055,23.307 243.485,22.65 242.325,21.336C241.181,20.005 240.609,18.383 240.609,16.472C240.609,14.595 241.198,12.99 242.376,11.659C243.57,10.328 245.115,9.662 247.009,9.662C248.904,9.662 250.423,10.302 251.566,11.582C252.71,12.845 253.281,14.424 253.281,16.318L253.256,17.01ZM247.009,11.301C245.781,11.301 244.757,11.702 243.937,12.504C243.118,13.289 242.632,14.296 242.478,15.525H251.464C251.344,14.245 250.883,13.221 250.081,12.453C249.296,11.685 248.272,11.301 247.009,11.301ZM263.106,9.867V11.582C262.901,11.565 262.688,11.557 262.466,11.557C261.305,11.557 260.367,11.907 259.65,12.606C258.933,13.289 258.575,14.288 258.575,15.602V23H256.757V9.97H258.498V11.992C258.805,11.429 259.309,10.934 260.008,10.507C260.708,10.064 261.596,9.842 262.671,9.842L263.106,9.867ZM270.315,20.901L274.82,9.97H276.715L271.211,23H269.367L263.915,9.97H265.886L270.315,20.901ZM277.693,11.506V9.97H281.661V23H279.844V11.506H277.693ZM281.687,6.411C281.448,6.633 281.141,6.744 280.765,6.744C280.39,6.744 280.074,6.633 279.818,6.411C279.579,6.172 279.46,5.874 279.46,5.515V5.413C279.46,5.225 279.494,5.063 279.562,4.926C279.801,4.431 280.202,4.184 280.765,4.184C281.141,4.184 281.448,4.312 281.687,4.568C281.943,4.807 282.071,5.114 282.071,5.49C282.071,5.865 281.943,6.172 281.687,6.411ZM286.926,21.31C285.748,19.962 285.159,18.358 285.159,16.498C285.159,14.637 285.748,13.033 286.926,11.685C288.12,10.337 289.673,9.662 291.585,9.662C293.257,9.662 294.623,10.14 295.681,11.096C296.739,12.035 297.405,13.204 297.678,14.603H295.835C295.561,13.579 295.058,12.777 294.324,12.197C293.59,11.599 292.677,11.301 291.585,11.301C290.22,11.301 289.11,11.787 288.257,12.76C287.421,13.733 287.003,14.979 287.003,16.498C287.003,18 287.421,19.237 288.257,20.21C289.11,21.182 290.22,21.669 291.585,21.669C292.677,21.669 293.59,21.379 294.324,20.798C295.058,20.201 295.561,19.39 295.835,18.366H297.678C297.405,19.766 296.739,20.944 295.681,21.899C294.623,22.838 293.257,23.307 291.585,23.307C289.673,23.307 288.12,22.642 286.926,21.31ZM312.431,17.01H301.602C301.687,18.375 302.148,19.493 302.984,20.363C303.821,21.234 304.904,21.669 306.236,21.669C307.208,21.669 308.062,21.421 308.796,20.926C309.529,20.414 310.041,19.749 310.332,18.93H312.226C311.833,20.227 311.108,21.285 310.05,22.104C308.992,22.906 307.712,23.307 306.21,23.307C304.23,23.307 302.66,22.65 301.5,21.336C300.356,20.005 299.784,18.383 299.784,16.472C299.784,14.595 300.373,12.99 301.551,11.659C302.745,10.328 304.29,9.662 306.184,9.662C308.079,9.662 309.598,10.302 310.741,11.582C311.885,12.845 312.456,14.424 312.456,16.318L312.431,17.01ZM306.184,11.301C304.956,11.301 303.932,11.702 303.112,12.504C302.293,13.289 301.807,14.296 301.653,15.525H310.639C310.519,14.245 310.059,13.221 309.256,12.453C308.471,11.685 307.447,11.301 306.184,11.301ZM320.105,23.307C318.347,23.307 317.033,22.898 316.163,22.078C315.309,21.242 314.84,20.192 314.755,18.93H316.598C316.666,19.8 316.99,20.483 317.571,20.978C318.168,21.472 319.013,21.72 320.105,21.72C321.18,21.72 322.016,21.524 322.614,21.131C323.228,20.722 323.535,20.184 323.535,19.518C323.535,18.836 323.254,18.332 322.691,18.008C322.144,17.667 321.479,17.436 320.694,17.317C319.909,17.197 319.115,17.052 318.313,16.882C317.528,16.711 316.854,16.353 316.291,15.806C315.744,15.26 315.471,14.492 315.471,13.502C315.471,12.444 315.907,11.54 316.777,10.789C317.647,10.038 318.825,9.662 320.31,9.662C321.948,9.662 323.16,10.08 323.945,10.917C324.73,11.753 325.174,12.709 325.276,13.784H323.459C323.373,13.033 323.066,12.427 322.537,11.966C322.008,11.488 321.248,11.25 320.259,11.25C319.286,11.25 318.535,11.454 318.006,11.864C317.494,12.274 317.238,12.794 317.238,13.426C317.238,13.989 317.434,14.432 317.827,14.757C318.236,15.081 318.74,15.294 319.337,15.397C319.934,15.482 320.574,15.602 321.257,15.755C321.957,15.909 322.605,16.08 323.203,16.267C323.8,16.455 324.295,16.822 324.687,17.368C325.097,17.914 325.302,18.614 325.302,19.467C325.302,20.525 324.849,21.43 323.945,22.181C323.057,22.932 321.777,23.307 320.105,23.307Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M10.968,3.328C10.968,2.374 11.742,1.6 12.696,1.6C19.058,1.6 24.216,6.758 24.216,13.12C24.216,14.074 23.442,14.848 22.488,14.848C21.534,14.848 20.76,14.074 20.76,13.12C20.76,8.666 17.15,5.056 12.696,5.056C11.742,5.056 10.968,4.282 10.968,3.328Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M19.032,28.672C19.032,29.626 18.258,30.4 17.304,30.4C10.942,30.4 5.784,25.242 5.784,18.88C5.784,17.926 6.558,17.152 7.512,17.152C8.466,17.152 9.24,17.926 9.24,18.88C9.24,23.334 12.85,26.944 17.304,26.944C18.258,26.944 19.032,27.718 19.032,28.672Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M2.328,20.032C1.374,20.032 0.6,19.258 0.6,18.304C0.6,11.942 5.758,6.784 12.12,6.784C13.074,6.784 13.848,7.558 13.848,8.512C13.848,9.466 13.074,10.24 12.12,10.24C7.666,10.24 4.056,13.85 4.056,18.304C4.056,19.258 3.282,20.032 2.328,20.032Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M27.672,11.968C28.626,11.968 29.4,12.742 29.4,13.696C29.4,20.058 24.242,25.216 17.88,25.216C16.926,25.216 16.152,24.442 16.152,23.488C16.152,22.534 16.926,21.76 17.88,21.76C22.334,21.76 25.944,18.15 25.944,13.696C25.944,12.742 26.718,11.968 27.672,11.968Z" />
+</vector>
diff --git a/vector/src/main/res/drawable/ic_logo_modular.xml b/vector/src/main/res/drawable/ic_logo_modular.xml
deleted file mode 100644
index c95ee66b86..0000000000
--- a/vector/src/main/res/drawable/ic_logo_modular.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="83dp"
-    android:height="14dp"
-    android:viewportWidth="83"
-    android:viewportHeight="14">
-  <path
-      android:pathData="M21.722,11.239V4.628h1.93v0.739c0.355,-0.584 1.182,-0.973 1.93,-0.973 0.946,0 1.655,0.39 1.97,1.05 0.513,-0.738 1.182,-1.05 2.088,-1.05 1.26,0 2.482,0.74 2.482,2.528V11.2h-1.97V7.389c0,-0.622 -0.354,-1.128 -1.063,-1.128 -0.71,0 -1.103,0.545 -1.103,1.128V11.2h-2.01V7.389c0,-0.622 -0.354,-1.128 -1.063,-1.128s-1.103,0.545 -1.103,1.128V11.2h-2.088v0.039z"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M41.459,7.933c0,2.061 -1.537,3.5 -3.546,3.5 -1.97,0 -3.545,-1.477 -3.545,-3.5 0,-2.06 1.575,-3.5 3.545,-3.5 2.01,0 3.546,1.478 3.546,3.5m-2.049,0c0,-1.127 -0.709,-1.633 -1.497,-1.633 -0.748,0 -1.497,0.506 -1.497,1.633 0,1.09 0.749,1.634 1.497,1.634 0.788,0.039 1.497,-0.506 1.497,-1.634"
-      android:fillColor="#2E2F32"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M57.807,10.578c-0.354,0.583 -1.103,0.816 -1.773,0.816 -1.615,0 -2.52,-1.166 -2.52,-2.566V4.667h2.048V8.4c0,0.622 0.354,1.128 1.063,1.128 0.67,0 1.103,-0.467 1.103,-1.128V4.667h2.049v5.405c0,0.584 0.04,1.09 0.079,1.167h-1.97c-0.04,-0.117 -0.079,-0.467 -0.079,-0.661"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M72.068,10.383c-0.315,0.623 -0.985,1.05 -1.812,1.05 -1.97,0 -3.31,-1.477 -3.31,-3.5 0,-1.944 1.261,-3.46 3.27,-3.46 1.182,0 1.734,0.66 1.852,0.971v-0.777h1.97v5.405c0,0.622 0.039,1.05 0.039,1.167h-1.97c-0.04,-0.156 -0.04,-0.506 -0.04,-0.778v-0.078zM70.531,9.683c0.828,0 1.537,-0.622 1.537,-1.75 0,-1.127 -0.67,-1.75 -1.537,-1.75 -0.866,0 -1.536,0.584 -1.536,1.75 0,1.09 0.71,1.75 1.536,1.75zM80.97,4.55c0.75,0 1.34,0.583 1.34,1.322 0,0.74 -0.59,1.284 -1.34,1.284 -0.748,0 -1.3,-0.584 -1.3,-1.284 0,-0.778 0.552,-1.322 1.3,-1.322zM78.922,11.239h-2.048L76.874,4.628h2.048v6.61z"
-      android:fillColor="#2E2F32"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M62.573,2.644h2.048v8.633h-2.048z"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M50.716,2.644h-2.009v2.528c-0.158,-0.233 -0.67,-0.66 -1.812,-0.66 -1.891,0 -3.23,1.477 -3.23,3.421 0,2.023 1.418,3.461 3.309,3.461 0.788,0 1.497,-0.35 1.772,-0.777 0,0.272 0.04,0.544 0.04,0.622h1.97c0,-0.156 -0.04,-0.583 -0.04,-1.167V2.644zM47.21,9.606c-0.788,0 -1.497,-0.545 -1.497,-1.634s0.71,-1.633 1.497,-1.633c0.788,0 1.497,0.544 1.497,1.633 0,1.05 -0.709,1.634 -1.497,1.634z"
-      android:fillColor="#2E2F32"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M16.374,1.233L14.346,0.09l-2.028,1.142 -0.016,11.534 2.044,1.157 2.028,-1.141zM4.189,7L2.145,5.859 0.117,7v5.767l2.044,1.157 2.028,-1.157zM8.245,8.157l3.035,-1.72V4.124L9.252,2.983l-1.007,0.593 -4.072,-2.328L2.145,0.09 0.117,1.248v2.298l8.128,4.61"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_material_add.xml b/vector/src/main/res/drawable/ic_material_add.xml
new file mode 100644
index 0000000000..757f450331
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_material_add.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:fillColor="#FF000000"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_material_save.xml b/vector/src/main/res/drawable/ic_material_save.xml
index e299376f3a..2f7924edda 100644
--- a/vector/src/main/res/drawable/ic_material_save.xml
+++ b/vector/src/main/res/drawable/ic_material_save.xml
@@ -1,5 +1,20 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M12.5,18L12.5,5.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19,13L12.5,19.5L6,13"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_permalink.xml b/vector/src/main/res/drawable/ic_permalink.xml
index 7c1aae169f..c26350a2e6 100644
--- a/vector/src/main/res/drawable/ic_permalink.xml
+++ b/vector/src/main/res/drawable/ic_permalink.xml
@@ -1,22 +1,7 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M9,12a5,5 0,0 0,7.54 0.54l3,-3a5,5 0,0 0,-7.07 -7.07l-1.72,1.71"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M13,10a5,5 0,0 0,-7.54 -0.54l-3,3a5,5 0,0 0,7.07 7.07l1.71,-1.71"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9E9E9E"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="25dp"
+    android:viewportHeight="25" android:viewportWidth="25"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M13.0285,7.0409L13.5273,6.5421C14.9052,5.1643 17.1259,5.151 18.4874,6.5125C19.849,7.874 19.8357,10.0947 18.4579,11.4725L16.0878,13.8425C14.71,15.2203 12.4893,15.2335 11.1277,13.872M11.9717,17.9589L11.4727,18.4579C10.0948,19.8357 7.8741,19.849 6.5126,18.4875C5.151,17.126 5.1643,14.9053 6.5421,13.5275L8.912,11.1577C10.2899,9.7799 12.5106,9.7667 13.8721,11.1281"
+        android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="2"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_phone.xml b/vector/src/main/res/drawable/ic_phone.xml
index 430c438577..e51cac614b 100644
--- a/vector/src/main/res/drawable/ic_phone.xml
+++ b/vector/src/main/res/drawable/ic_phone.xml
@@ -1,14 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M21.9994,16.9738V19.9846C22.0017,20.5498 21.7651,21.0898 21.3478,21.4718C20.9305,21.8539 20.3712,22.0427 19.8072,21.9918C16.7128,21.6563 13.7404,20.601 11.1289,18.9108C8.6992,17.3699 6.6393,15.3141 5.0953,12.8892C3.3959,10.271 2.3382,7.2901 2.0082,4.188C1.9574,3.6268 2.1452,3.0702 2.5258,2.6541C2.9064,2.2379 3.4448,2.0006 4.0093,2.0001H7.0261C8.0356,1.9902 8.896,2.7287 9.0373,3.7263C9.1646,4.6898 9.4007,5.6359 9.7412,6.5464C10.0175,7.2799 9.8407,8.1068 9.2887,8.664L8.0116,9.9386C9.4431,12.4512 11.5276,14.5315 14.0451,15.9602L15.3222,14.6856C15.8805,14.1346 16.7091,13.9583 17.444,14.234C18.3564,14.5738 19.3043,14.8094 20.2697,14.9365C21.2809,15.0789 22.0247,15.955 21.9994,16.9738Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
+      android:pathData="M8.527,16.4613C9.668,17.6932 12.4148,19.8263 13.1635,20.2641C13.2078,20.29 13.2585,20.3201 13.3152,20.3538C14.4576,21.0329 18.0373,23.1609 20.6454,21.1694C22.6661,19.6266 22.0091,17.8909 21.3289,17.375C20.8633,17.0128 19.4914,16.0145 18.2006,15.1152C16.9331,14.2322 16.2268,14.9397 15.7492,15.418C15.7404,15.4268 15.7317,15.4355 15.7231,15.4442L14.7621,16.4051C14.5174,16.6498 14.1451,16.5605 13.7886,16.2804C12.5092,15.3061 11.5681,14.3659 11.0972,13.895L11.0933,13.891C10.6225,13.4202 9.6939,12.4908 8.7196,11.2114C8.4395,10.8548 8.3502,10.4826 8.5949,10.2379L9.5559,9.2769C9.5645,9.2683 9.5732,9.2596 9.582,9.2508C10.0603,8.7732 10.7678,8.0668 9.8848,6.7994C8.9855,5.5086 7.9872,4.1367 7.625,3.6711C7.1091,2.9909 5.3734,2.3339 3.8306,4.3546C1.8391,6.9627 3.9671,10.5424 4.6462,11.6848C4.6799,11.7415 4.7101,11.7922 4.7359,11.8365C5.1737,12.5851 7.2951,15.3203 8.527,16.4613Z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_radio_button_off.xml b/vector/src/main/res/drawable/ic_radio_button_off.xml
new file mode 100644
index 0000000000..a26c27495c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_radio_button_off.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+
+    <!-- Note: I adapted this vector manually since clip-path is API24+ -->
+    <path
+        android:fillColor="?riotx_disabled_view_color"
+        android:pathData="M10,5M10,0C4.5,0 0,4.5 0,10C0,15.5 4.5,20 10,20C15.5,20 20,15.5 20,10C20,4.5 15.5,0 10,0ZM10,18C5.6,18 2,14.4 2,10C2,5.6 5.6,2 10,2C14.4,2 18,5.6 18,10C18,14.4 14.4,18 10,18Z" />
+
+</vector>
diff --git a/vector/src/main/res/drawable/ic_reply.xml b/vector/src/main/res/drawable/ic_reply.xml
index 924dda827c..f23730624f 100644
--- a/vector/src/main/res/drawable/ic_reply.xml
+++ b/vector/src/main/res/drawable/ic_reply.xml
@@ -1,22 +1,11 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="13dp"
-    android:viewportWidth="22"
-    android:viewportHeight="13">
-  <path
-      android:pathData="M5.4444,1l-4.4444,4.3636l4.4444,4.3636"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M21,11.9091L21,9.7273C21,7.3173 19.0102,5.3636 16.5556,5.3636L1,5.3636"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="25dp"
+    android:viewportHeight="25" android:viewportWidth="25"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M13.9217,19.5H16.0147C18.4917,19.5 20.4997,17.4106 20.4997,14.8333C20.4997,12.256 18.4917,10.1666 16.0147,10.1666H6.5449"
+        android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M9.1988,5.5L4.5,10.214L9.1988,14.9281"
+        android:strokeColor="#000000" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_riot_icon.xml b/vector/src/main/res/drawable/ic_riot_icon.xml
new file mode 100644
index 0000000000..51db35b239
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_riot_icon.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="61dp"
+    android:viewportWidth="50"
+    android:viewportHeight="61">
+  <path
+      android:pathData="M18.3955,17.8083V26.3699L27.1656,26.3609C27.277,26.3609 27.3786,26.3579 27.4797,26.3515C29.7857,26.2008 31.5882,24.3266 31.5882,22.0849C31.5882,19.7263 29.6086,17.8083 27.1744,17.8083H18.3955ZM9.7219,60.0954C4.9319,60.0954 1.0483,56.3331 1.0483,51.6915V35.6749C1.017,35.3844 1,35.0891 1,34.7902C0.9995,34.4859 1.0159,34.1855 1.0483,33.8891V9.4044C1.0483,4.7629 4.9319,1 9.7219,1H27.1744C39.1737,1 48.9359,10.4586 48.9359,22.0849C48.9359,33.1388 40.0252,42.3786 28.6499,43.1205C28.1664,43.1529 27.6681,43.1693 27.1744,43.1693L18.3955,43.1777V51.6915C18.3955,56.3331 14.5124,60.0954 9.7219,60.0954Z"
+      android:fillColor="#A2DDEF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18.3954,17.8083V26.3699L27.1655,26.3609C27.2768,26.3609 27.3785,26.3579 27.4796,26.3515C29.7855,26.2008 31.588,24.3266 31.588,22.0849C31.588,19.7263 29.6085,17.8083 27.1742,17.8083H18.3954ZM9.7217,60.0954C4.9317,60.0954 1.0481,56.3331 1.0481,51.6915V9.4044C1.0481,4.7629 4.9317,1 9.7217,1H27.1742C39.1736,1 48.9358,10.4586 48.9358,22.0849C48.9358,33.1388 40.025,42.3786 28.6497,43.1205C28.1663,43.1529 27.6679,43.1693 27.1742,43.1693L18.3954,43.1777V51.6915C18.3954,56.3331 14.5122,60.0954 9.7217,60.0954Z"
+      android:strokeWidth="1.51616"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#368BD6"/>
+  <path
+      android:pathData="M9.7219,51.6914V9.4043H27.1744C34.4022,9.4043 40.2618,15.0817 40.2618,22.0848C40.2618,28.7975 34.8785,34.2918 28.0674,34.7359C27.7718,34.7553 27.4746,34.7652 27.1744,34.7652C20.3726,34.7718 15.2712,34.7768 11.8703,34.78C11.3929,34.7805 10.6767,34.7812 9.7219,34.7821"
+      android:strokeWidth="1.51616"
+      android:fillColor="#00000000"
+      android:strokeColor="#368BD6"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.8692,4.5845C18.1989,6.4229 18.7096,8.6537 18.3072,10.8631C17.9044,13.074 16.6367,14.9999 14.7377,16.2873C10.8171,18.9453 5.3938,18.0198 2.6485,14.2242C1.3187,12.3857 0.8081,10.1555 1.211,7.9451C1.6133,5.7347 2.881,3.8083 4.7805,2.5213C8.7011,-0.1366 14.1239,0.7888 16.8692,4.5845ZM40.3333,60.0907C37.5998,60.0907 34.9105,58.8425 33.2225,56.5088L20.9639,39.5588C18.215,35.7576 19.1671,30.5169 23.0897,27.854C27.0123,25.1891 32.4213,26.112 35.1702,29.9132L47.4287,46.8632C50.1781,50.6644 49.2261,55.9051 45.3034,58.568C43.7884,59.5969 42.0521,60.0907 40.3333,60.0907Z"
+      android:fillColor="#368BD6"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_room_actions_leave.xml b/vector/src/main/res/drawable/ic_room_actions_leave.xml
index 346defac7c..c172e7cd51 100644
--- a/vector/src/main/res/drawable/ic_room_actions_leave.xml
+++ b/vector/src/main/res/drawable/ic_room_actions_leave.xml
@@ -1,47 +1,11 @@
-<!--
-  ~ Copyright 2019 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.
-  ~
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M14,8L8,14"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8,8L14,14"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M12,2.5L19.9587,1.2434C20.768,1.1156 21.5,1.7411 21.5,2.5604V21.4396C21.5,22.2589 20.768,22.8844 19.9587,22.7566L12,21.5V2.5Z"/>
+    <group>
+        <clip-path android:pathData="M3.8333,2.5L13.1667,2.5A1.3333,1.3333 0,0 1,14.5 3.8333L14.5,20.1667A1.3333,1.3333 0,0 1,13.1667 21.5L3.8333,21.5A1.3333,1.3333 0,0 1,2.5 20.1667L2.5,3.8333A1.3333,1.3333 0,0 1,3.8333 2.5z"/>
+        <path android:fillColor="#00000000"
+            android:pathData="M3.8333,2.5L13.1667,2.5A1.3333,1.3333 0,0 1,14.5 3.8333L14.5,20.1667A1.3333,1.3333 0,0 1,13.1667 21.5L3.8333,21.5A1.3333,1.3333 0,0 1,2.5 20.1667L2.5,3.8333A1.3333,1.3333 0,0 1,3.8333 2.5z"
+            android:strokeColor="#ffffff" android:strokeWidth="4"/>
+    </group>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_actions_notifications_all.xml b/vector/src/main/res/drawable/ic_room_actions_notifications_all.xml
index 5bf7226c59..c6e4f12a5b 100644
--- a/vector/src/main/res/drawable/ic_room_actions_notifications_all.xml
+++ b/vector/src/main/res/drawable/ic_room_actions_notifications_all.xml
@@ -1,39 +1,17 @@
-<!--
-  ~ Copyright 2019 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.
-  ~
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="17dp"
-    android:height="16dp"
-    android:viewportWidth="17"
-    android:viewportHeight="16">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M10,1l-5,4l-4,0l0,6l4,0l5,4z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+      android:pathData="M10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2662,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0637,20.75H10.1863Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
   <path
-      android:pathData="M14.54,4.46C16.4919,6.4125 16.4919,9.5775 14.54,11.53"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+      android:pathData="M19,14.425C19,15.6762 19.6737,16.4875 20.4988,16.9688C21.0625,17.2987 21.75,17.7525 21.75,18.3025C21.75,18.9212 21.3513,19.3612 20.5263,19.3612H12.125H3.7238C2.8988,19.3612 2.5,18.935 2.5,18.3025C2.5,17.7525 3.2013,17.2987 3.7513,16.9688C4.5625,16.4875 5.25,15.6625 5.25,14.425V9.75C5.25,5.955 8.495,2.875 12.125,2.875C15.755,2.875 19,5.955 19,9.75V14.425ZM15.2052,8.5436C15.4557,8.3083 15.8511,8.3214 16.0884,8.5697C16.2993,8.805 16.2993,9.1579 16.1147,9.3932L12.016,14.8169L11.9765,14.8692C11.6074,15.3136 10.9352,15.3789 10.487,15.013C10.4472,14.9932 10.4149,14.9586 10.3845,14.9259C10.3746,14.9153 10.3649,14.9049 10.3552,14.8953L8.1797,12.4909C7.9161,12.1772 7.9425,11.7066 8.2588,11.4452C8.5224,11.21 8.9047,11.21 9.1815,11.393L11.0406,12.5165L15.2052,8.5436Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.125,4.25C12.8844,4.25 13.5,3.6344 13.5,2.875C13.5,2.1156 12.8844,1.5 12.125,1.5C11.3656,1.5 10.75,2.1156 10.75,2.875C10.75,3.6344 11.3656,4.25 12.125,4.25Z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_actions_notifications_all_noisy.xml b/vector/src/main/res/drawable/ic_room_actions_notifications_all_noisy.xml
index 0eec24a115..d9190a461b 100644
--- a/vector/src/main/res/drawable/ic_room_actions_notifications_all_noisy.xml
+++ b/vector/src/main/res/drawable/ic_room_actions_notifications_all_noisy.xml
@@ -1,39 +1,10 @@
-<!--
-  ~ Copyright 2019 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.
-  ~
-  -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="18dp"
-    android:viewportWidth="22"
-    android:viewportHeight="18">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M10,2l-5,4l-4,0l0,6l4,0l5,4z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M18.07,1.93C21.9738,5.835 21.9738,12.165 18.07,16.07M14.54,5.46C16.4919,7.4125 16.4919,10.5775 14.54,12.53"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+      android:pathData="M13.4923,3.0211C13.4974,2.9731 13.5,2.9243 13.5,2.875C13.5,2.1156 12.8844,1.5 12.125,1.5C11.3656,1.5 10.75,2.1156 10.75,2.875C10.75,2.9243 10.7526,2.9731 10.7577,3.0211C7.7183,3.6742 5.25,6.4401 5.25,9.75V14.425C5.25,15.6625 4.5625,16.4875 3.7513,16.9688C3.2013,17.2988 2.5,17.7525 2.5,18.3025C2.5,18.935 2.8988,19.3613 3.7238,19.3613H12.125H20.5263C21.3513,19.3613 21.75,18.9213 21.75,18.3025C21.75,17.7525 21.0625,17.2988 20.4988,16.9688C19.6738,16.4875 19,15.6763 19,14.425V9.75C19,6.4401 16.5317,3.6742 13.4923,3.0211ZM10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2663,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0638,20.75H10.1863Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_actions_notifications_mentions.xml b/vector/src/main/res/drawable/ic_room_actions_notifications_mentions.xml
index 6bdf317097..5b54b751f0 100644
--- a/vector/src/main/res/drawable/ic_room_actions_notifications_mentions.xml
+++ b/vector/src/main/res/drawable/ic_room_actions_notifications_mentions.xml
@@ -1,47 +1,5 @@
-<!--
-  ~ Copyright 2019 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.
-  ~
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="16dp"
-    android:viewportWidth="24"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M10,1l-5,4l-4,0l0,6l4,0l5,4z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M18.8097,7.8097m-1.5238,0a1.5238,1.5238 0,1 1,3.0476 0a1.5238,1.5238 0,1 1,-3.0476 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.3"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M20.3336,6.2858L20.3336,8.1906C20.3336,8.8218 20.8452,9.3335 21.4764,9.3335C22.1076,9.3335 22.6193,8.8218 22.6193,8.1906L22.6193,7.8097C22.6192,6.0393 21.3995,4.5024 19.6755,4.1001C17.9515,3.6977 16.1776,4.5361 15.3938,6.1235C14.6101,7.7109 15.0233,9.629 16.3909,10.753C17.7586,11.877 19.7204,11.9108 21.1259,10.8344"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.3"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="25dp"
+    android:viewportHeight="25" android:viewportWidth="25"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M17.625,9.75C19.9032,9.75 21.75,7.9032 21.75,5.625C21.75,3.3468 19.9032,1.5 17.625,1.5C15.3468,1.5 13.5,3.3468 13.5,5.625C13.5,7.9032 15.3468,9.75 17.625,9.75ZM12.0806,2.875C8.4686,2.9 5.25,5.9703 5.25,9.7498V14.4248C5.25,15.6623 4.5625,16.4873 3.7513,16.9686C3.2013,17.2986 2.5,17.7523 2.5,18.3023C2.5,18.9348 2.8988,19.3611 3.7238,19.3611H12.125H20.5263C21.3513,19.3611 21.75,18.9211 21.75,18.3023C21.75,17.7523 21.0625,17.2986 20.4988,16.9686C19.6737,16.4873 19,15.6761 19,14.4248V11.659C18.5578,11.7593 18.0976,11.8123 17.625,11.8123C14.2077,11.8123 11.4375,9.0421 11.4375,5.6248C11.4375,4.637 11.6689,3.7034 12.0806,2.875ZM10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2662,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0637,20.75H10.1863Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_actions_notifications_mutes.xml b/vector/src/main/res/drawable/ic_room_actions_notifications_mutes.xml
index 89bbc832cb..b2c21c6c9d 100644
--- a/vector/src/main/res/drawable/ic_room_actions_notifications_mutes.xml
+++ b/vector/src/main/res/drawable/ic_room_actions_notifications_mutes.xml
@@ -1,47 +1,5 @@
-<!--
-  ~ Copyright 2019 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.
-  ~
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="23dp"
-    android:height="16dp"
-    android:viewportWidth="23"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M10,1l-5,4l-4,0l0,6l4,0l5,4z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M22,5L16,11"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M16,5L22,11"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="25dp"
+    android:viewportHeight="25" android:viewportWidth="25"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M3.1236,1.7096C2.7331,1.3191 2.0999,1.3191 1.7094,1.7096C1.3189,2.1001 1.3189,2.7333 1.7094,3.1238L5.7677,7.1821C5.4356,7.9756 5.25,8.8424 5.25,9.75V14.425C5.25,15.6625 4.5625,16.4875 3.7513,16.9688C3.2013,17.2988 2.5,17.7525 2.5,18.3025C2.5,18.935 2.8988,19.3613 3.7238,19.3613H12.125H17.9469L21.8761,23.2905C22.2666,23.681 22.8998,23.681 23.2903,23.2905C23.6808,22.8999 23.6808,22.2668 23.2903,21.8762L3.1236,1.7096ZM19,14.425C19,14.5462 19.0063,14.6632 19.0185,14.7762L8.3172,4.0749C9.053,3.5731 9.8816,3.2093 10.7577,3.0211C10.7526,2.9731 10.75,2.9244 10.75,2.875C10.75,2.1156 11.3656,1.5 12.125,1.5C12.8844,1.5 13.5,2.1156 13.5,2.875C13.5,2.9244 13.4974,2.9731 13.4923,3.0211C16.5317,3.6742 19,6.4402 19,9.75V14.425ZM10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2663,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0638,20.75H10.1863Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_actions_settings.xml b/vector/src/main/res/drawable/ic_room_actions_settings.xml
index c80dfe0409..151293ce28 100644
--- a/vector/src/main/res/drawable/ic_room_actions_settings.xml
+++ b/vector/src/main/res/drawable/ic_room_actions_settings.xml
@@ -1,39 +1,5 @@
-<!--
-  ~ Copyright 2019 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.
-  ~
-  -->
-
-<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,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M19.4,15C19.1277,15.6171 19.2583,16.3378 19.73,16.82L19.79,16.88C20.1656,17.2551 20.3766,17.7642 20.3766,18.295C20.3766,18.8258 20.1656,19.3349 19.79,19.71C19.4149,20.0856 18.9058,20.2966 18.375,20.2966C17.8442,20.2966 17.3351,20.0856 16.96,19.71L16.9,19.65C16.4178,19.1783 15.6971,19.0477 15.08,19.32C14.4755,19.5791 14.0826,20.1724 14.08,20.83L14.08,21C14.08,22.1046 13.1846,23 12.08,23C10.9754,23 10.08,22.1046 10.08,21L10.08,20.91C10.0642,20.2327 9.6359,19.6339 9,19.4C8.3829,19.1277 7.6622,19.2583 7.18,19.73L7.12,19.79C6.7449,20.1656 6.2358,20.3766 5.705,20.3766C5.1742,20.3766 4.6651,20.1656 4.29,19.79C3.9144,19.4149 3.7034,18.9058 3.7034,18.375C3.7034,17.8442 3.9144,17.3351 4.29,16.96L4.35,16.9C4.8217,16.4178 4.9523,15.6971 4.68,15.08C4.4209,14.4755 3.8276,14.0826 3.17,14.08L3,14.08C1.8954,14.08 1,13.1846 1,12.08C1,10.9754 1.8954,10.08 3,10.08L3.09,10.08C3.7673,10.0642 4.3661,9.6359 4.6,9C4.8723,8.3829 4.7417,7.6622 4.27,7.18L4.21,7.12C3.8344,6.7449 3.6234,6.2358 3.6234,5.705C3.6234,5.1742 3.8344,4.6651 4.21,4.29C4.5851,3.9144 5.0942,3.7034 5.625,3.7034C6.1558,3.7034 6.6649,3.9144 7.04,4.29L7.1,4.35C7.5822,4.8217 8.3029,4.9523 8.92,4.68L9,4.68C9.6045,4.4209 9.9974,3.8276 10,3.17L10,3C10,1.8954 10.8954,1 12,1C13.1046,1 14,1.8954 14,3L14,3.09C14.0026,3.7476 14.3955,4.3409 15,4.6C15.6171,4.8723 16.3378,4.7417 16.82,4.27L16.88,4.21C17.2551,3.8344 17.7642,3.6234 18.295,3.6234C18.8258,3.6234 19.3349,3.8344 19.71,4.21C20.0856,4.5851 20.2966,5.0942 20.2966,5.625C20.2966,6.1558 20.0856,6.6649 19.71,7.04L19.65,7.1C19.1783,7.5822 19.0477,8.3029 19.32,8.92L19.32,9C19.5791,9.6045 20.1724,9.9974 20.83,10L21,10C22.1046,10 23,10.8954 23,12C23,13.1046 22.1046,14 21,14L20.91,14C20.2524,14.0026 19.6591,14.3955 19.4,15Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9E9E9E"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M20.0988,9.0162C20.3188,9.5938 20.8825,9.9788 21.5013,9.9788C22.3263,9.9788 23,10.6525 23,11.4775V12.5225C23,13.3475 22.3263,14.0213 21.5013,14.0213C20.8825,14.0213 20.3188,14.4062 20.0988,14.9838C20.0806,15.0292 20.0624,15.0753 20.0441,15.1218C19.9792,15.2863 19.9125,15.4555 19.8375,15.6163C19.5763,16.18 19.7,16.84 20.14,17.28C20.7313,17.8575 20.7313,18.8062 20.14,19.3975L19.3975,20.14C18.82,20.7313 17.8713,20.7313 17.28,20.14C16.8538,19.7 16.18,19.5763 15.6163,19.8375C15.41,19.9338 15.2037,20.0163 14.9838,20.0988C14.4062,20.3188 14.0213,20.8825 14.0213,21.5013C14.0213,22.3263 13.3475,23 12.5225,23H11.4775C10.6525,23 9.9788,22.3263 9.9788,21.5013C9.9788,20.8825 9.5938,20.3188 9.0162,20.0988C8.9708,20.0806 8.9247,20.0624 8.8781,20.044C8.7137,19.9792 8.5445,19.9125 8.3837,19.8375C7.82,19.5763 7.16,19.7 6.72,20.14C6.1425,20.7313 5.1937,20.7313 4.6025,20.14L3.86,19.3975C3.2687,18.82 3.2687,17.8713 3.86,17.28C4.3,16.8538 4.4237,16.18 4.1625,15.6163C4.0662,15.41 3.9838,15.2037 3.9012,14.9838C3.6813,14.4062 3.1175,14.0213 2.4987,14.0213C1.6738,14.0213 1,13.3475 1,12.5225V11.4775C1,10.6525 1.6738,9.9788 2.4987,9.9788C3.1175,9.9788 3.6813,9.5938 3.9012,9.0162C3.9446,8.8774 3.999,8.7441 4.0539,8.6093C4.086,8.5305 4.1183,8.4512 4.1487,8.37C4.41,7.8063 4.2863,7.1462 3.8463,6.7063C3.255,6.1287 3.255,5.18 3.8463,4.5887L4.6025,3.86C5.18,3.2687 6.1287,3.2687 6.72,3.86C7.1462,4.3 7.82,4.4237 8.3837,4.1625C8.59,4.0662 8.7963,3.97 9.0162,3.9012C9.5938,3.6813 9.9788,3.1175 9.9788,2.4987C9.9788,1.6738 10.6525,1 11.4775,1H12.5225C13.3475,1 14.0213,1.6738 14.0213,2.4987C14.0213,3.1312 14.4062,3.6813 14.9838,3.9012C15.0292,3.9194 15.0753,3.9376 15.1218,3.956C15.2863,4.0208 15.4555,4.0875 15.6163,4.1625C16.18,4.4237 16.84,4.3 17.28,3.86C17.8575,3.2687 18.8062,3.2687 19.3975,3.86L20.14,4.6025C20.7313,5.18 20.7313,6.1287 20.14,6.72C19.7,7.1462 19.5763,7.82 19.8375,8.3837C19.9338,8.59 20.0163,8.7963 20.0988,9.0162ZM12,17.5C8.9613,17.5 6.5,15.0387 6.5,12C6.5,8.9613 8.9613,6.5 12,6.5C15.0387,6.5 17.5,8.9613 17.5,12C17.5,15.0387 15.0387,17.5 12,17.5Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_profile_member_list.xml b/vector/src/main/res/drawable/ic_room_profile_member_list.xml
index 75ae1944d9..ffd4bb2690 100644
--- a/vector/src/main/res/drawable/ic_room_profile_member_list.xml
+++ b/vector/src/main/res/drawable/ic_room_profile_member_list.xml
@@ -1,35 +1,6 @@
-<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,21V19C17,16.7909 15.2091,15 13,15H5C2.7909,15 1,16.7909 1,19V21"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M9,11C11.2091,11 13,9.2091 13,7C13,4.7909 11.2091,3 9,3C6.7909,3 5,4.7909 5,7C5,9.2091 6.7909,11 9,11Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M23,21V19C22.9986,17.1771 21.765,15.5857 20,15.13"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M16,3.13C17.7699,3.5832 19.0078,5.178 19.0078,7.005C19.0078,8.832 17.7699,10.4268 16,10.88"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24ZM8,12.5C9.6568,12.5 11,11.0449 11,9.25C11,7.4551 9.6568,6 8,6C6.3432,6 5,7.4551 5,9.25C5,11.0449 6.3432,12.5 8,12.5ZM17.2564,13.6944C18.708,13.6944 19.8846,12.4197 19.8846,10.8472C19.8846,9.2747 18.708,8 17.2564,8C15.8049,8 14.6282,9.2747 14.6282,10.8472C14.6282,12.4197 15.8049,13.6944 17.2564,13.6944ZM9.1568,14.1133C11.3547,14.5947 13,16.5529 13,18.8953L13,22.138H7L2.5717,17.5C3.5321,15.4313 5.6017,14 8,14C8.3957,14 8.7825,14.039 9.1568,14.1133ZM14.3251,15.9165C14.7577,16.8182 15,17.8284 15,18.8953L15,22.138H17.2564L21.7013,17.5C20.7697,16.0027 19.1272,15.0085 17.2564,15.0085C16.1711,15.0085 15.1626,15.3432 14.3251,15.9165Z"/>
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_profile_notification.xml b/vector/src/main/res/drawable/ic_room_profile_notification.xml
index 8aa04d7b82..649b72f78a 100644
--- a/vector/src/main/res/drawable/ic_room_profile_notification.xml
+++ b/vector/src/main/res/drawable/ic_room_profile_notification.xml
@@ -4,6 +4,14 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M2,16C1.4477,16 1,16.4477 1,17C1,17.5523 1.4477,18 2,18V16ZM5,9H4H5ZM19,9H20H19ZM13.73,21L14.595,21.5018C14.7744,21.1924 14.775,20.8108 14.5965,20.5009C14.418,20.191 14.0876,20 13.73,20V21ZM10.27,21V20C9.9124,20 9.582,20.191 9.4035,20.5009C9.225,20.8108 9.2255,21.1924 9.405,21.5018L10.27,21ZM22,16H2V18H22V16ZM2,18C4.2091,18 6,16.2091 6,14H4C4,15.1046 3.1046,16 2,16V18ZM6,14V9H4V14H6ZM6,9C6,5.6863 8.6863,3 12,3V1C7.5817,1 4,4.5817 4,9H6ZM12,3C15.3137,3 18,5.6863 18,9H20C20,4.5817 16.4183,1 12,1V3ZM18,9V14H20V9H18ZM18,14C18,16.2091 19.7909,18 22,18V16C20.8954,16 20,15.1046 20,14H18ZM12.865,20.4982C12.6861,20.8066 12.3565,20.9965 12,20.9965V22.9965C13.0696,22.9965 14.0583,22.427 14.595,21.5018L12.865,20.4982ZM12,20.9965C11.6435,20.9965 11.3139,20.8066 11.135,20.4982L9.405,21.5018C9.9417,22.427 10.9304,22.9965 12,22.9965V20.9965ZM10.27,22H13.73V20H10.27V22Z"
+      android:pathData="M9.885,21C9.795,21.24 9.75,21.48 9.75,21.75C9.75,22.995 10.755,24 12,24C13.245,24 14.25,22.995 14.25,21.75C14.25,21.48 14.19,21.24 14.115,21H9.885Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21.135,16.875C20.235,16.35 19.5,15.465 19.5,14.1V9C19.5,4.86 15.96,1.5 12,1.5C8.04,1.5 4.5,4.86 4.5,9V14.1C4.5,15.45 3.75,16.35 2.865,16.875C2.265,17.235 1.5,17.73 1.5,18.33C1.5,19.02 1.935,19.485 2.835,19.485H12H21.165C22.065,19.485 22.5,19.005 22.5,18.33C22.5,17.73 21.75,17.235 21.135,16.875Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,3C12.8284,3 13.5,2.3284 13.5,1.5C13.5,0.6716 12.8284,0 12,0C11.1716,0 10.5,0.6716 10.5,1.5C10.5,2.3284 11.1716,3 12,3Z"
       android:fillColor="#000000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_profile_settings.xml b/vector/src/main/res/drawable/ic_room_profile_settings.xml
index 438d4b4bf2..250d9805dc 100644
--- a/vector/src/main/res/drawable/ic_room_profile_settings.xml
+++ b/vector/src/main/res/drawable/ic_room_profile_settings.xml
@@ -1,22 +1,5 @@
-<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,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M19.4,15C19.1277,15.6171 19.2583,16.3378 19.73,16.82L19.79,16.88C20.1656,17.2551 20.3766,17.7642 20.3766,18.295C20.3766,18.8258 20.1656,19.3349 19.79,19.71C19.4149,20.0856 18.9058,20.2966 18.375,20.2966C17.8442,20.2966 17.3351,20.0856 16.96,19.71L16.9,19.65C16.4178,19.1783 15.6971,19.0477 15.08,19.32C14.4755,19.5791 14.0826,20.1724 14.08,20.83V21C14.08,22.1046 13.1846,23 12.08,23C10.9754,23 10.08,22.1046 10.08,21V20.91C10.0642,20.2327 9.6359,19.6339 9,19.4C8.3829,19.1277 7.6622,19.2583 7.18,19.73L7.12,19.79C6.7449,20.1656 6.2358,20.3766 5.705,20.3766C5.1742,20.3766 4.6651,20.1656 4.29,19.79C3.9144,19.4149 3.7034,18.9058 3.7034,18.375C3.7034,17.8442 3.9144,17.3351 4.29,16.96L4.35,16.9C4.8217,16.4178 4.9524,15.6971 4.68,15.08C4.4209,14.4755 3.8276,14.0826 3.17,14.08H3C1.8954,14.08 1,13.1846 1,12.08C1,10.9754 1.8954,10.08 3,10.08H3.09C3.7673,10.0642 4.3661,9.6359 4.6,9C4.8724,8.3829 4.7417,7.6622 4.27,7.18L4.21,7.12C3.8345,6.7449 3.6234,6.2358 3.6234,5.705C3.6234,5.1742 3.8345,4.6651 4.21,4.29C4.5851,3.9144 5.0942,3.7034 5.625,3.7034C6.1558,3.7034 6.6649,3.9144 7.04,4.29L7.1,4.35C7.5822,4.8217 8.3029,4.9524 8.92,4.68H9C9.6045,4.4209 9.9974,3.8276 10,3.17V3C10,1.8954 10.8954,1 12,1C13.1046,1 14,1.8954 14,3V3.09C14.0026,3.7476 14.3955,4.3409 15,4.6C15.6171,4.8724 16.3378,4.7417 16.82,4.27L16.88,4.21C17.2551,3.8345 17.7642,3.6234 18.295,3.6234C18.8258,3.6234 19.3349,3.8345 19.71,4.21C20.0856,4.5851 20.2966,5.0942 20.2966,5.625C20.2966,6.1558 20.0856,6.6649 19.71,7.04L19.65,7.1C19.1783,7.5822 19.0477,8.3029 19.32,8.92V9C19.5791,9.6045 20.1724,9.9974 20.83,10H21C22.1046,10 23,10.8954 23,12C23,13.1046 22.1046,14 21,14H20.91C20.2524,14.0026 19.6591,14.3955 19.4,15Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M20.835,8.745C21.075,9.375 21.69,9.795 22.365,9.795C23.265,9.795 24,10.53 24,11.43V12.57C24,13.47 23.265,14.205 22.365,14.205C21.69,14.205 21.075,14.625 20.835,15.255C20.8152,15.3046 20.7953,15.3549 20.7753,15.4056C20.7046,15.5851 20.6319,15.7696 20.55,15.945C20.265,16.56 20.4,17.28 20.88,17.76C21.525,18.39 21.525,19.425 20.88,20.07L20.07,20.88C19.44,21.525 18.405,21.525 17.76,20.88C17.295,20.4 16.56,20.265 15.945,20.55C15.72,20.655 15.495,20.745 15.255,20.835C14.625,21.075 14.205,21.69 14.205,22.365C14.205,23.265 13.47,24 12.57,24H11.43C10.53,24 9.795,23.265 9.795,22.365C9.795,21.69 9.375,21.075 8.745,20.835C8.6954,20.8152 8.6451,20.7953 8.5944,20.7753C8.4149,20.7046 8.2304,20.6319 8.055,20.55C7.44,20.265 6.72,20.4 6.24,20.88C5.61,21.525 4.575,21.525 3.93,20.88L3.12,20.07C2.475,19.44 2.475,18.405 3.12,17.76C3.6,17.295 3.735,16.56 3.45,15.945C3.345,15.72 3.255,15.495 3.165,15.255C2.925,14.625 2.31,14.205 1.635,14.205C0.735,14.205 0,13.47 0,12.57V11.43C0,10.53 0.735,9.795 1.635,9.795C2.31,9.795 2.925,9.375 3.165,8.745C3.2123,8.5935 3.2716,8.4481 3.3315,8.301C3.3665,8.215 3.4018,8.1285 3.435,8.04C3.72,7.425 3.585,6.705 3.105,6.225C2.46,5.595 2.46,4.56 3.105,3.915L3.93,3.12C4.56,2.475 5.595,2.475 6.24,3.12C6.705,3.6 7.44,3.735 8.055,3.45C8.28,3.345 8.505,3.24 8.745,3.165C9.375,2.925 9.795,2.31 9.795,1.635C9.795,0.735 10.53,0 11.43,0H12.57C13.47,0 14.205,0.735 14.205,1.635C14.205,2.325 14.625,2.925 15.255,3.165C15.3046,3.1848 15.3549,3.2047 15.4056,3.2247C15.5851,3.2954 15.7696,3.3681 15.945,3.45C16.56,3.735 17.28,3.6 17.76,3.12C18.39,2.475 19.425,2.475 20.07,3.12L20.88,3.93C21.525,4.56 21.525,5.595 20.88,6.24C20.4,6.705 20.265,7.44 20.55,8.055C20.655,8.28 20.745,8.505 20.835,8.745ZM12,18C8.685,18 6,15.315 6,12C6,8.685 8.685,6 12,6C15.315,6 18,8.685 18,12C18,15.315 15.315,18 12,18Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_room_profile_uploads.xml b/vector/src/main/res/drawable/ic_room_profile_uploads.xml
index 039484e308..5a09d6cd1f 100644
--- a/vector/src/main/res/drawable/ic_room_profile_uploads.xml
+++ b/vector/src/main/res/drawable/ic_room_profile_uploads.xml
@@ -4,18 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M13,2H6C4.8954,2 4,2.8954 4,4V20C4,21.1046 4.8954,22 6,22H18C19.1046,22 20,21.1046 20,20V9L13,2Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M13,2V9H20"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"
-      android:strokeLineCap="round"/>
+      android:pathData="M0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12ZM12,19C11.4477,19 11,18.5523 11,18L11,8.4066L8.2072,11.1994C7.8166,11.5899 7.1835,11.5899 6.793,11.1994C6.4024,10.8089 6.4024,10.1757 6.793,9.7852L11.2929,5.2852C11.6834,4.8947 12.3166,4.8947 12.7071,5.2852L17.207,9.7852C17.5976,10.1757 17.5976,10.8089 17.207,11.1994C16.8165,11.5899 16.1834,11.5899 15.7928,11.1994L13,8.4066L13,18C13,18.5523 12.5523,19 12,19Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_search.xml b/vector/src/main/res/drawable/ic_search.xml
index e2a66c7743..e72df715cf 100644
--- a/vector/src/main/res/drawable/ic_search.xml
+++ b/vector/src/main/res/drawable/ic_search.xml
@@ -9,7 +9,7 @@
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#03B381"
+      android:strokeColor="#9E9E9E"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M19,19l-4.35,-4.35"
@@ -17,6 +17,6 @@
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#03B381"
+      android:strokeColor="#9E9E9E"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_send.xml b/vector/src/main/res/drawable/ic_send.xml
index d79ba7c126..9f10eca84a 100644
--- a/vector/src/main/res/drawable/ic_send.xml
+++ b/vector/src/main/res/drawable/ic_send.xml
@@ -1,14 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M20.142,11H4.586M20.142,11L1.05,20.192 4.586,11 1.05,1.808z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#03B381"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="20dp"
+    android:viewportHeight="20" android:viewportWidth="20"
+    android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M18.7922,11.1454L2.3564,19.3594C1.2489,19.9131 0.0966,18.7254 0.6379,17.6419C0.6379,17.6419 2.675,13.5282 3.2353,12.4507C3.7956,11.3731 4.437,11.1866 10.3935,10.4168C10.6139,10.3883 10.7943,10.2219 10.7943,9.9998C10.7943,9.778 10.6139,9.6117 10.3935,9.5832C4.437,8.8133 3.7956,8.6268 3.2353,7.5493C2.675,6.4721 0.6379,2.358 0.6379,2.358C0.0966,1.2749 1.2489,0.0869 2.3564,0.6405L18.7922,8.8549C19.7359,9.3262 19.7359,10.6738 18.7922,11.1454Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_advanced.xml b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
new file mode 100644
index 0000000000..fbcd165cda
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?riotx_header_panel_text_secondary" android:fillType="evenOdd" android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.5,12C8.5,12.8284 7.8284,13.5 7,13.5C6.1716,13.5 5.5,12.8284 5.5,12C5.5,11.1716 6.1716,10.5 7,10.5C7.8284,10.5 8.5,11.1716 8.5,12ZM12.25,13.5C13.0784,13.5 13.75,12.8284 13.75,12C13.75,11.1716 13.0784,10.5 12.25,10.5C11.4216,10.5 10.75,11.1716 10.75,12C10.75,12.8284 11.4216,13.5 12.25,13.5ZM19,12C19,12.8284 18.3284,13.5 17.5,13.5C16.6716,13.5 16,12.8284 16,12C16,11.1716 16.6716,10.5 17.5,10.5C18.3284,10.5 19,11.1716 19,12Z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_call.xml b/vector/src/main/res/drawable/ic_settings_root_call.xml
index b29ef895ad..0742e16e0d 100644
--- a/vector/src/main/res/drawable/ic_settings_root_call.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_call.xml
@@ -1,14 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M21,15.92v3a2,2 0,0 1,-2.18 2,19.79 19.79,0 0,1 -8.63,-3.07 19.5,19.5 0,0 1,-6 -6,19.79 19.79,0 0,1 -3.07,-8.67A2,2 0,0 1,3.11 1h3a2,2 0,0 1,2 1.72c0.127,0.96 0.361,1.903 0.7,2.81a2,2 0,0 1,-0.45 2.11L7.09,8.91a16,16 0,0 0,6 6l1.27,-1.27a2,2 0,0 1,2.11 -0.45c0.907,0.339 1.85,0.573 2.81,0.7A2,2 0,0 1,21 15.92z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M0.5,8C0.5,6.3432 1.8432,5 3.5,5H14.5C16.1569,5 17.5,6.3432 17.5,8V17C17.5,18.6569 16.1569,20 14.5,20H3.5C1.8432,20 0.5,18.6569 0.5,17V8Z"
+      android:fillColor="?riotx_header_panel_text_secondary"/>
+  <path
+      android:pathData="M19.4229,9.4388L23.5259,6.8221C23.9142,6.5744 24.4229,6.8533 24.4229,7.3139V17.545C24.4229,18.0326 23.8601,18.305 23.4777,18.0025L19.4229,14.7959V9.4388Z"
+      android:fillColor="?riotx_header_panel_text_secondary"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_flair.xml b/vector/src/main/res/drawable/ic_settings_root_flair.xml
index 889b2f7e5c..36b282455b 100644
--- a/vector/src/main/res/drawable/ic_settings_root_flair.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_flair.xml
@@ -1,22 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="24dp"
-    android:viewportWidth="16"
-    android:viewportHeight="24">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M8,8m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M4.21,13.89L3,23l5,-3 5,3 -1.21,-9.12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M12.4893,23C13.1012,23 13.6058,22.5491 13.6917,21.9156C14.6258,15.3344 15.5169,14.4325 21.8727,13.7132C22.5169,13.638 23,13.112 23,12.5C23,11.8773 22.5276,11.3727 21.8834,11.2868C15.5598,10.4601 14.7439,9.6549 13.6917,3.0736C13.5844,2.4402 13.1012,2 12.4893,2C11.888,2 11.3834,2.4402 11.2868,3.0844C10.3635,9.6656 9.4724,10.5675 3.1166,11.2868C2.4724,11.362 2,11.8773 2,12.5C2,13.112 2.4617,13.6273 3.1166,13.7132C9.4402,14.5936 10.2239,15.3451 11.2868,21.9264C11.4049,22.5598 11.8988,23 12.4893,23Z"
+      android:fillColor="?riotx_header_panel_text_secondary"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_general.xml b/vector/src/main/res/drawable/ic_settings_root_general.xml
index c70ec666ec..a07bf7a164 100644
--- a/vector/src/main/res/drawable/ic_settings_root_general.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_general.xml
@@ -1,22 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M19.4,15a1.65,1.65 0,0 0,0.33 1.82l0.06,0.06a2,2 0,1 1,-2.83 2.83l-0.06,-0.06a1.65,1.65 0,0 0,-1.82 -0.33,1.65 1.65,0 0,0 -1,1.51L14.08,21a2,2 0,1 1,-4 0v-0.09A1.65,1.65 0,0 0,9 19.4a1.65,1.65 0,0 0,-1.82 0.33l-0.06,0.06a2,2 0,1 1,-2.83 -2.83l0.06,-0.06a1.65,1.65 0,0 0,0.33 -1.82,1.65 1.65,0 0,0 -1.51,-1L3,14.08a2,2 0,1 1,0 -4h0.09A1.65,1.65 0,0 0,4.6 9a1.65,1.65 0,0 0,-0.33 -1.82l-0.06,-0.06a2,2 0,1 1,2.83 -2.83l0.06,0.06a1.65,1.65 0,0 0,1.82 0.33L9,4.68a1.65,1.65 0,0 0,1 -1.51L10,3a2,2 0,1 1,4 0v0.09a1.65,1.65 0,0 0,1 1.51,1.65 1.65,0 0,0 1.82,-0.33l0.06,-0.06a2,2 0,1 1,2.83 2.83l-0.06,0.06a1.65,1.65 0,0 0,-0.33 1.82L19.32,9c0.26,0.604 0.852,0.997 1.51,1L21,10a2,2 0,1 1,0 4h-0.09a1.65,1.65 0,0 0,-1.51 1z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M20.5988,9.5162C20.8188,10.0938 21.3825,10.4788 22.0013,10.4788C22.8263,10.4788 23.5,11.1525 23.5,11.9775V13.0225C23.5,13.8475 22.8263,14.5213 22.0013,14.5213C21.3825,14.5213 20.8188,14.9062 20.5988,15.4838C20.5806,15.5292 20.5624,15.5753 20.5441,15.6218C20.4792,15.7863 20.4125,15.9555 20.3375,16.1163C20.0763,16.68 20.2,17.34 20.64,17.78C21.2313,18.3575 21.2313,19.3062 20.64,19.8975L19.8975,20.64C19.32,21.2313 18.3713,21.2313 17.78,20.64C17.3538,20.2 16.68,20.0763 16.1163,20.3375C15.91,20.4338 15.7037,20.5163 15.4838,20.5988C14.9062,20.8188 14.5213,21.3825 14.5213,22.0013C14.5213,22.8263 13.8475,23.5 13.0225,23.5H11.9775C11.1525,23.5 10.4788,22.8263 10.4788,22.0013C10.4788,21.3825 10.0938,20.8188 9.5162,20.5988C9.4708,20.5806 9.4247,20.5624 9.3781,20.544C9.2137,20.4792 9.0445,20.4125 8.8837,20.3375C8.32,20.0763 7.66,20.2 7.22,20.64C6.6425,21.2313 5.6937,21.2313 5.1025,20.64L4.36,19.8975C3.7687,19.32 3.7687,18.3713 4.36,17.78C4.8,17.3538 4.9237,16.68 4.6625,16.1163C4.5662,15.91 4.4837,15.7037 4.4012,15.4838C4.1813,14.9062 3.6175,14.5213 2.9987,14.5213C2.1737,14.5213 1.5,13.8475 1.5,13.0225V11.9775C1.5,11.1525 2.1737,10.4788 2.9987,10.4788C3.6175,10.4788 4.1813,10.0938 4.4012,9.5162C4.4446,9.3774 4.499,9.2441 4.5539,9.1093C4.586,9.0305 4.6183,8.9512 4.6487,8.87C4.91,8.3062 4.7863,7.6462 4.3463,7.2063C3.755,6.6287 3.755,5.68 4.3463,5.0887L5.1025,4.36C5.68,3.7687 6.6287,3.7687 7.22,4.36C7.6462,4.8 8.32,4.9237 8.8837,4.6625C9.09,4.5662 9.2963,4.47 9.5162,4.4012C10.0938,4.1813 10.4788,3.6175 10.4788,2.9987C10.4788,2.1737 11.1525,1.5 11.9775,1.5H13.0225C13.8475,1.5 14.5213,2.1737 14.5213,2.9987C14.5213,3.6312 14.9062,4.1813 15.4838,4.4012C15.5292,4.4194 15.5753,4.4376 15.6218,4.4559C15.7863,4.5208 15.9555,4.5875 16.1163,4.6625C16.68,4.9237 17.34,4.8 17.78,4.36C18.3575,3.7687 19.3062,3.7687 19.8975,4.36L20.64,5.1025C21.2313,5.68 21.2313,6.6287 20.64,7.22C20.2,7.6462 20.0763,8.32 20.3375,8.8837C20.4338,9.09 20.5163,9.2963 20.5988,9.5162ZM12.5,18C9.4613,18 7,15.5387 7,12.5C7,9.4613 9.4613,7 12.5,7C15.5387,7 18,9.4613 18,12.5C18,15.5387 15.5387,18 12.5,18Z"
+      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_help_about.xml b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
index 2e13a0d1b7..0c79955cba 100644
--- a/vector/src/main/res/drawable/ic_settings_root_help_about.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
@@ -1,30 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#7E899C"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8.09,8C8.5754,6.62 9.9854,5.7914 11.4272,6.0387C12.869,6.286 13.9222,7.5372 13.92,9C13.92,11 10.92,12 10.92,12"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#7E899C"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M11.0002,15.9913L11,15.9913"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#7E899C"
-      android:fillType="evenOdd"
-      android:strokeLineCap="round"/>
+      android:pathData="M12.5,22.5C18.0228,22.5 22.5,18.0228 22.5,12.5C22.5,6.9771 18.0228,2.5 12.5,2.5C6.9771,2.5 2.5,6.9771 2.5,12.5C2.5,18.0228 6.9771,22.5 12.5,22.5ZM12.5002,18.6458C13.1905,18.6458 13.7502,18.0862 13.7502,17.3958C13.7502,16.7055 13.1905,16.1458 12.5002,16.1458C11.8098,16.1458 11.2502,16.7055 11.2502,17.3958C11.2502,18.0862 11.8098,18.6458 12.5002,18.6458ZM10.7636,10.6163C10.7636,9.6542 11.5442,8.8802 12.4997,8.8802C13.4524,8.8802 14.2358,9.6636 14.2358,10.6163C14.2358,11.0576 14.0471,11.215 13.3036,11.7287C12.9741,11.9563 12.5223,12.2725 12.1705,12.7362C11.7939,13.2327 11.5622,13.8517 11.5622,14.6389H13.4372C13.4372,14.2533 13.5396,14.0339 13.6643,13.8695C13.8138,13.6724 14.0304,13.5055 14.3694,13.2713C14.405,13.2467 14.4426,13.2212 14.4818,13.1945C15.0963,12.7765 16.1108,12.0865 16.1108,10.6163C16.1108,8.6281 14.4879,7.0052 12.4997,7.0052C10.5142,7.0052 8.8885,8.6132 8.8885,10.6163H10.7636Z"
+      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
index aa98c73b5a..cf039d55dc 100644
--- a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
@@ -1,30 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="17dp"
-    android:height="20dp"
-    android:viewportWidth="17"
-    android:viewportHeight="20">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M16,19v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M8.5,5m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M5.672,2.172l5.656,5.656"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M22.5,12.5C22.5,18.0228 18.0228,22.5 12.5,22.5C6.9771,22.5 2.5,18.0228 2.5,12.5C2.5,6.9771 6.9771,2.5 12.5,2.5C18.0228,2.5 22.5,6.9771 22.5,12.5ZM7,11.25C6.7239,11.25 6.5,11.4739 6.5,11.75V13.25C6.5,13.5261 6.7239,13.75 7,13.75H18C18.2761,13.75 18.5,13.5261 18.5,13.25V11.75C18.5,11.4739 18.2761,11.25 18,11.25H7Z"
+      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_labs.xml b/vector/src/main/res/drawable/ic_settings_root_labs.xml
index f44a0c91d6..5416ad7089 100644
--- a/vector/src/main/res/drawable/ic_settings_root_labs.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_labs.xml
@@ -1,14 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="22dp"
-    android:viewportWidth="18"
-    android:viewportHeight="22">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M1,14s1,-1 4,-1 5,2 8,2 4,-1 4,-1V2s-1,1 -4,1 -5,-2 -8,-2 -4,1 -4,1v12zM1,21v-7"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M5.25,22.5C4.5596,22.5 4,21.9404 4,21.25V12.8687C4,12.6622 4.275,12.5 4.625,12.5H5.875C6.225,12.5 6.5,12.6622 6.5,12.8687V21.25C6.5,21.9404 5.9404,22.5 5.25,22.5Z"
+      android:fillColor="?riotx_header_panel_text_secondary"/>
+  <path
+      android:pathData="M7.3481,2.5C4.8899,2.5 4.0004,4.1544 4.0004,5.1811V15.9785H5.8277C9.6771,14.2291 13.4294,17.5377 17.3919,17.4997C21.3545,17.4616 21.5,15.3319 21.5,14.267V5.7136C21.5,2.2337 19.0904,5.5804 14.9982,4.2304C11.4458,3.0584 10.8053,2.5 7.3481,2.5Z"
+      android:fillColor="?riotx_header_panel_text_secondary"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_notification.xml b/vector/src/main/res/drawable/ic_settings_root_notification.xml
index ae1cba0845..bf3786aeab 100644
--- a/vector/src/main/res/drawable/ic_settings_root_notification.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_notification.xml
@@ -1,14 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="22dp"
-    android:viewportWidth="20"
-    android:viewportHeight="22">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M16,7A6,6 0,1 0,4 7c0,7 -3,9 -3,9h18s-3,-2 -3,-9M11.73,20a2,2 0,0 1,-3.46 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M13.4923,3.0211C13.4974,2.9731 13.5,2.9243 13.5,2.875C13.5,2.1156 12.8844,1.5 12.125,1.5C11.3656,1.5 10.75,2.1156 10.75,2.875C10.75,2.9243 10.7526,2.9731 10.7577,3.0211C7.7183,3.6742 5.25,6.4401 5.25,9.75V14.425C5.25,15.6625 4.5625,16.4875 3.7513,16.9688C3.2013,17.2988 2.5,17.7525 2.5,18.3025C2.5,18.935 2.8988,19.3613 3.7238,19.3613H12.125H20.5263C21.3513,19.3613 21.75,18.9213 21.75,18.3025C21.75,17.7525 21.0625,17.2988 20.4988,16.9688C19.6738,16.4875 19,15.6763 19,14.425V9.75C19,6.4401 16.5317,3.6742 13.4923,3.0211ZM10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2663,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0638,20.75H10.1863Z"
+      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_preferences.xml b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
index 2a57f92724..1aa5e338f0 100644
--- a/vector/src/main/res/drawable/ic_settings_root_preferences.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
@@ -1,14 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="20dp"
-    android:viewportWidth="24"
-    android:viewportHeight="20">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M4,19v-7M4,8V1M12,19v-9M12,6V1M20,19v-5M20,10V1M1,12h6M9,6h6M17,14h6"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M8.5,4.5C4.0817,4.5 0.5,8.0817 0.5,12.5C0.5,16.9183 4.0817,20.5 8.5,20.5H16.5C20.9183,20.5 24.5,16.9183 24.5,12.5C24.5,8.0817 20.9183,4.5 16.5,4.5H8.5ZM13.5,12.5C13.5,15.2614 11.2614,17.5 8.5,17.5C5.7386,17.5 3.5,15.2614 3.5,12.5C3.5,9.7386 5.7386,7.5 8.5,7.5C11.2614,7.5 13.5,9.7386 13.5,12.5Z"
+      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
index eb5bdc837a..194eec1be3 100644
--- a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
@@ -1,22 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="22dp"
-    android:viewportWidth="20"
-    android:viewportHeight="22">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M3,10L17,10A2,2 0,0 1,19 12L19,19A2,2 0,0 1,17 21L3,21A2,2 0,0 1,1 19L1,12A2,2 0,0 1,3 10z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M5,10L5,6a5,5 0,1 1,10 0v4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
+      android:pathData="M11.8333,2.5C8.8878,2.5 6.5,4.8878 6.5,7.8333V10.5C5.3954,10.5 4.5,11.3954 4.5,12.5V20.5C4.5,21.6046 5.3954,22.5 6.5,22.5H18.5C19.6046,22.5 20.5,21.6046 20.5,20.5V12.5C20.5,11.3954 19.6046,10.5 18.5,10.5V7.8333C18.5,4.8878 16.1122,2.5 13.1667,2.5H11.8333ZM15.8333,10.5V7.8333C15.8333,6.3606 14.6394,5.1667 13.1667,5.1667H11.8333C10.3606,5.1667 9.1667,6.3606 9.1667,7.8333V10.5H15.8333Z"
+      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_share.xml b/vector/src/main/res/drawable/ic_share.xml
index 0be4570475..2061960b5c 100644
--- a/vector/src/main/res/drawable/ic_share.xml
+++ b/vector/src/main/res/drawable/ic_share.xml
@@ -1,12 +1,17 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M5.4861,9.7344L5.4501,9.3925L14.9912,4.5311L15.2479,4.7833C15.7127,5.24 16.3352,5.5 17,5.5C18.3807,5.5 19.5,4.3807 19.5,3C19.5,1.6193 18.3807,0.5 17,0.5C15.6193,0.5 14.5,1.6193 14.5,3C14.5,3.0963 14.5054,3.1918 14.5162,3.2863L14.5554,3.6308L5.0234,8.4876L4.7666,8.2311C4.3005,7.7656 3.6719,7.5 3,7.5C1.6193,7.5 0.5,8.6193 0.5,10C0.5,11.3807 1.6193,12.5 3,12.5C3.6072,12.5 4.1796,12.2834 4.6301,11.8955L4.8892,11.6724L14.493,16.7788L14.501,17.0699C14.5379,18.4208 15.6453,19.5 17,19.5C18.3807,19.5 19.5,18.3807 19.5,17C19.5,15.6193 18.3807,14.5 17,14.5C16.2197,14.5 15.4997,14.8592 15.0283,15.4628L14.77,15.7935L5.3947,10.8086L5.4598,10.4494C5.4865,10.3023 5.5,10.1521 5.5,10C5.5,9.9107 5.4953,9.8221 5.4861,9.7344Z"
-      android:strokeWidth="1"
-      android:fillColor="#979797"
-      android:strokeColor="#979797"
-      android:fillType="evenOdd"/>
+<vector android:autoMirrored="true" android:height="25dp"
+    android:viewportHeight="25" android:viewportWidth="25"
+    android:width="25dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M17.5,17.5L6.5,12.5L17.5,7.5"
+        android:strokeColor="#000000" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
+    <path android:fillColor="#FCFCFC"
+        android:pathData="M17.5,7.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="2"/>
+    <path android:fillColor="#FCFCFC"
+        android:pathData="M17.5,17.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="2"/>
+    <path android:fillColor="#FCFCFC"
+        android:pathData="M6.5,12.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="2"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_star_24dp.xml b/vector/src/main/res/drawable/ic_star_24dp.xml
index 3113cf8f47..336b70c1f7 100644
--- a/vector/src/main/res/drawable/ic_star_24dp.xml
+++ b/vector/src/main/res/drawable/ic_star_24dp.xml
@@ -1,14 +1,5 @@
-<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,2L15.09,8.26L22,9.27L17,14.14L18.18,21.02L12,17.77L5.82,21.02L7,14.14L2,9.27L8.91,8.26L12,2Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M11.2188,1.9096C11.4563,1.1413 12.5438,1.1413 12.7812,1.9096L14.8953,8.751H21.8475C22.6296,8.751 22.9653,9.7436 22.3438,10.2183L16.6847,14.5415L18.8247,21.4668C19.0598,22.2274 18.1798,22.8412 17.5472,22.3579L12,18.1203L6.4529,22.3579C5.8203,22.8412 4.9403,22.2274 5.1754,21.4668L7.3154,14.5415L1.6563,10.2183C1.0347,9.7436 1.3705,8.751 2.1526,8.751H9.1048L11.2188,1.9096Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_video.xml b/vector/src/main/res/drawable/ic_video.xml
index f9c57db65e..d751601281 100644
--- a/vector/src/main/res/drawable/ic_video.xml
+++ b/vector/src/main/res/drawable/ic_video.xml
@@ -1,22 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M23,7L16,12L23,17V7Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
+      android:pathData="M0.5,7.5C0.5,5.8432 1.8432,4.5 3.5,4.5H14.5C16.1569,4.5 17.5,5.8432 17.5,7.5V17.5C17.5,19.1569 16.1569,20.5 14.5,20.5H3.5C1.8432,20.5 0.5,19.1569 0.5,17.5V7.5Z"
+      android:fillColor="#000000"/>
   <path
-      android:pathData="M1,7C1,5.8954 1.8954,5 3,5H14C15.1046,5 16,5.8954 16,7V17C16,18.1046 15.1046,19 14,19H3C1.8954,19 1,18.1046 1,17V7Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
+      android:pathData="M19.5,9.5L22.8753,6.7998C23.5301,6.2759 24.5,6.7421 24.5,7.5806V17.4194C24.5,18.2579 23.5301,18.7241 22.8753,18.2002L19.5,15.5V9.5Z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_view_reactions.xml b/vector/src/main/res/drawable/ic_view_reactions.xml
index f4106852b8..f9d5d762c9 100644
--- a/vector/src/main/res/drawable/ic_view_reactions.xml
+++ b/vector/src/main/res/drawable/ic_view_reactions.xml
@@ -1,38 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
   <path
-      android:pathData="M11,11m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9e9e9e"
-      android:strokeLineCap="round"/>
+      android:pathData="M5.5001,8.25a2,2.25 0,1 0,4 0a2,2.25 0,1 0,-4 0z"
+      android:fillColor="#000000"/>
   <path
-      android:pathData="m7,13s1.5,2 4,2 4,-2 4,-2"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9e9e9e"
-      android:strokeLineCap="round"/>
+      android:pathData="M15.5001,8.25a2,2.25 0,1 0,4 0a2,2.25 0,1 0,-4 0z"
+      android:fillColor="#000000"/>
   <path
-      android:pathData="m8,8h0.01"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9e9e9e"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="m14,8h0.01"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#9e9e9e"
-      android:strokeLineCap="round"/>
+      android:pathData="M6.8923,14.5482C6.6427,14.0555 6.0411,13.8584 5.5483,14.1079C5.0556,14.3574 4.8585,14.9591 5.108,15.4518L6.8923,14.5482ZM19.9083,15.4187C20.1395,14.9171 19.9204,14.3231 19.4188,14.0919C18.9173,13.8606 18.3232,14.0798 18.092,14.5813L19.9083,15.4187ZM6.0001,15C5.108,15.4518 5.1082,15.4522 5.1084,15.4526C5.1085,15.4528 5.1087,15.4532 5.1089,15.4535C5.1092,15.4542 5.1096,15.4549 5.11,15.4557C5.1108,15.4572 5.1117,15.459 5.1127,15.4611C5.1148,15.4651 5.1175,15.4702 5.1206,15.4762C5.1269,15.4881 5.1353,15.5039 5.1457,15.5231C5.1666,15.5615 5.196,15.6141 5.234,15.6787C5.3099,15.8078 5.4206,15.9859 5.5674,16.1966C5.86,16.6166 6.3014,17.1742 6.9031,17.7328C8.1101,18.8535 9.9896,20 12.5908,20V18C10.6269,18 9.2111,17.1465 8.264,16.2672C7.7886,15.8258 7.4383,15.3834 7.2085,15.0534C7.094,14.8891 7.0108,14.7547 6.9581,14.6651C6.9318,14.6203 6.9132,14.5869 6.9023,14.5668C6.8968,14.5567 6.8932,14.55 6.8915,14.5468C6.8907,14.5452 6.8903,14.5445 6.8905,14.5447C6.8905,14.5448 6.8907,14.5452 6.891,14.5458C6.8912,14.5461 6.8913,14.5464 6.8915,14.5468C6.8917,14.547 6.8918,14.5474 6.8919,14.5475C6.8921,14.5478 6.8923,14.5482 6.0001,15ZM12.5908,20C15.1961,20 17.0358,18.8498 18.2034,17.718C18.784,17.1552 19.2031,16.5937 19.4786,16.1707C19.6168,15.9585 19.7202,15.7791 19.7909,15.6488C19.8263,15.5836 19.8536,15.5305 19.873,15.4915C19.8828,15.472 19.8906,15.456 19.8964,15.4438C19.8993,15.4377 19.9018,15.4325 19.9038,15.4283C19.9047,15.4262 19.9056,15.4244 19.9064,15.4228C19.9067,15.422 19.9071,15.4212 19.9074,15.4205C19.9076,15.4202 19.9078,15.4197 19.9078,15.4196C19.9081,15.4191 19.9083,15.4187 19.0001,15C18.092,14.5813 18.0922,14.5809 18.0924,14.5805C18.0924,14.5804 18.0926,14.58 18.0927,14.5798C18.0929,14.5794 18.0931,14.579 18.0932,14.5787C18.0935,14.578 18.0937,14.5776 18.0938,14.5775C18.0939,14.5771 18.0937,14.5777 18.093,14.5791C18.0916,14.5821 18.0884,14.5886 18.0835,14.5984C18.0737,14.618 18.057,14.6508 18.033,14.695C17.985,14.7834 17.9087,14.9165 17.8027,15.0793C17.5897,15.4063 17.2624,15.8448 16.8114,16.282C15.9156,17.1502 14.5507,18 12.5908,18V20Z"
+      android:fillColor="#000000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_x_green.xml b/vector/src/main/res/drawable/ic_x_gray.xml
similarity index 92%
rename from vector/src/main/res/drawable/ic_x_green.xml
rename to vector/src/main/res/drawable/ic_x_gray.xml
index f38424ace1..d70405081d 100644
--- a/vector/src/main/res/drawable/ic_x_green.xml
+++ b/vector/src/main/res/drawable/ic_x_gray.xml
@@ -9,6 +9,6 @@
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:fillType="evenOdd"
-      android:strokeColor="#03B381"
+      android:strokeColor="#9E9E9E"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/vector/src/main/res/drawable/riot_animated_logo.xml b/vector/src/main/res/drawable/riot_animated_logo.xml
index 39c55fc004..638b1b1ceb 100644
--- a/vector/src/main/res/drawable/riot_animated_logo.xml
+++ b/vector/src/main/res/drawable/riot_animated_logo.xml
@@ -2,15 +2,15 @@
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:oneshot="false">
     <item
-        android:drawable="@drawable/riot_splash_0_blue"
+        android:drawable="@drawable/element_logo_green"
         android:duration="@integer/splash_animation_velocity" />
     <item
-        android:drawable="@drawable/riot_splash_1_green"
+        android:drawable="@drawable/element_logo_green"
         android:duration="@integer/splash_animation_velocity" />
     <item
-        android:drawable="@drawable/riot_splash_2_pink"
+        android:drawable="@drawable/element_logo_green"
         android:duration="@integer/splash_animation_velocity" />
     <item
-        android:drawable="@drawable/riot_splash_3_red"
+        android:drawable="@drawable/element_logo_green"
         android:duration="@integer/splash_animation_velocity" />
 </animation-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/splash.xml b/vector/src/main/res/drawable/splash.xml
index e14ff2d517..5acc22075b 100644
--- a/vector/src/main/res/drawable/splash.xml
+++ b/vector/src/main/res/drawable/splash.xml
@@ -5,13 +5,13 @@
     android:opacity="opaque">
 
     <!-- Background color -->
-    <item android:drawable="@color/riot_primary_background_color_light" />
+    <item android:drawable="@color/riotx_accent" />
 
     <!-- Centered logo -->
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/riot_splash_0_blue" />
+            android:src="@drawable/riot_splash_white" />
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_login.xml b/vector/src/main/res/layout/activity_login.xml
index 0add6040a7..9b10f4f391 100644
--- a/vector/src/main/res/layout/activity_login.xml
+++ b/vector/src/main/res/layout/activity_login.xml
@@ -26,7 +26,7 @@
             android:id="@+id/loginTouchArea"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:background="?vctr_waiting_background_color"
+            android:background="?riotx_waiting_background_color"
             android:clickable="true"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/activity_progress.xml b/vector/src/main/res/layout/activity_progress.xml
index 5942160525..fe5623f235 100644
--- a/vector/src/main/res/layout/activity_progress.xml
+++ b/vector/src/main/res/layout/activity_progress.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/vctr_waiting_background_color">
+    android:background="?attr/riotx_waiting_background_color">
 
     <ProgressBar
         android:layout_width="40dp"
diff --git a/vector/src/main/res/layout/activity_vector_settings.xml b/vector/src/main/res/layout/activity_vector_settings.xml
index eaba9b33d3..395acd37a4 100755
--- a/vector/src/main/res/layout/activity_vector_settings.xml
+++ b/vector/src/main/res/layout/activity_vector_settings.xml
@@ -29,7 +29,7 @@
         android:id="@+id/vector_settings_spinner_views"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/vctr_waiting_background_color"
+        android:background="?attr/riotx_waiting_background_color"
         android:clickable="true"
         android:visibility="gone">
 
diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 69060a57da..0011bf1987 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
+    android:background="?riotx_bottom_sheet_background"
     android:fadeScrollbars="false"
     android:scrollbars="vertical">
 
diff --git a/vector/src/main/res/layout/bottom_sheet_call_controls.xml b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
index 04cb2af20d..c9fc1cdad4 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_controls.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
@@ -5,6 +5,7 @@
     android:id="@+id/callControlsWrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?riotx_bottom_sheet_background"
     android:orientation="vertical">
 
     <im.vector.riotx.core.ui.views.BottomSheetActionButton
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list.xml b/vector/src/main/res/layout/bottom_sheet_generic_list.xml
index 0bd6665325..ac085a4b50 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list.xml
@@ -4,6 +4,7 @@
     android:id="@+id/bottomSheetRecyclerView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?riotx_bottom_sheet_background"
     android:fadeScrollbars="false"
     android:scrollbars="vertical"
     tools:itemCount="5"
diff --git a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
index 6a4b6d3eaa..a405a386f0 100644
--- a/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
+++ b/vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
@@ -3,8 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:orientation="vertical">
+    android:background="?riotx_bottom_sheet_background"
+    android:orientation="vertical"
+    android:paddingTop="8dp">
 
     <TextView
         android:id="@+id/bottomSheetTitle"
@@ -12,7 +13,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:padding="8dp"
-        android:textColor="?android:textColorSecondary"
+        android:textColor="?riotx_text_primary"
         android:textSize="16sp"
         tools:text="@string/reactions" />
 
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index c6605dfc05..6bf5d5d240 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -5,6 +5,7 @@
     android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?riotx_bottom_sheet_background"
     android:orientation="vertical"
     android:paddingTop="8dp"
     android:paddingBottom="8dp">
diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
index 1aa77a6c3b..e4df4b5c9a 100644
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@@ -4,6 +4,7 @@
     android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?riotx_bottom_sheet_background"
     android:orientation="vertical"
     android:paddingTop="8dp"
     android:paddingBottom="8dp">
@@ -16,8 +17,8 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="8dp"
         android:text="@string/room_widget_permission_title"
-        android:textSize="20sp"
         android:textColor="?riotx_text_primary"
+        android:textSize="20sp"
         android:textStyle="bold" />
 
     <TextView
@@ -59,9 +60,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
+                android:textColor="?riotx_text_primary"
                 android:textSize="18sp"
                 android:textStyle="bold"
-                android:textColor="?riotx_text_primary"
                 tools:text="User name" />
 
             <TextView
@@ -69,8 +70,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:textSize="14sp"
                 android:textColor="?riotx_text_secondary"
+                android:textSize="14sp"
                 tools:text="\@foo:matrix.org" />
         </LinearLayout>
     </LinearLayout>
@@ -100,7 +101,7 @@
             android:layout_marginEnd="@dimen/layout_vertical_margin"
             android:layout_marginRight="@dimen/layout_vertical_margin"
             android:text="@string/decline"
-            android:textAllCaps="true"/>
+            android:textAllCaps="true" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/widgetPermissionContinue"
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 2dab92d90a..b6fb49178d 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorBackgroundFloating"
+    android:background="?riotx_bottom_sheet_background"
     android:orientation="vertical"
     android:paddingTop="8dp"
     android:paddingBottom="8dp">
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 8de64de060..88c7e536d8 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -7,6 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
+    android:background="?riotx_bottom_sheet_background"
     android:fadeScrollbars="false"
     android:scrollbars="vertical">
 
diff --git a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
index e013b2a7b1..70c9872a09 100644
--- a/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
+++ b/vector/src/main/res/layout/bottom_sheet_with_fragments.xml
@@ -2,6 +2,7 @@
 <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/bottomSheetFragmentContainer"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
+    android:layout_height="wrap_content"
+    android:background="?riotx_bottom_sheet_background" />
 
 
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
index 4607f28f34..a2bf24551d 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
@@ -13,7 +13,7 @@
         android:id="@+id/related_message_backround"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
         android:id="@+id/related_message_background_top_separator"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -32,7 +32,7 @@
         android:id="@+id/related_message_background_bottom_separator"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index 198f4ca83b..a71634508c 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -13,7 +13,7 @@
         android:id="@+id/related_message_backround"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -21,7 +21,7 @@
         android:id="@+id/related_message_background_top_separator"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintEnd_toEndOf="@id/related_message_backround"
         app:layout_constraintStart_toStartOf="@+id/related_message_backround"
         app:layout_constraintTop_toTopOf="@id/related_message_backround" />
@@ -30,7 +30,7 @@
         android:id="@+id/related_message_background_bottom_separator"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         app:layout_constraintBottom_toBottomOf="@id/related_message_backround"
         app:layout_constraintEnd_toEndOf="@id/related_message_backround"
         app:layout_constraintStart_toStartOf="@+id/related_message_backround" />
diff --git a/vector/src/main/res/layout/dialog_change_password.xml b/vector/src/main/res/layout/dialog_change_password.xml
index 12806a56b7..840f67c715 100644
--- a/vector/src/main/res/layout/dialog_change_password.xml
+++ b/vector/src/main/res/layout/dialog_change_password.xml
@@ -30,7 +30,7 @@
             android:layout_height="@dimen/layout_touch_size"
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
-            android:src="@drawable/ic_eye_black"
+            android:src="@drawable/ic_eye"
             android:tint="?attr/colorAccent" />
 
     </LinearLayout>
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index c45933eb40..541b75e7c7 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -1,58 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="140dp"
-        android:background="#27303A">
+    <LinearLayout
+        android:id="@+id/disclaimerIconsLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="32dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="23dp"
-            android:layout_marginLeft="23dp"
-            android:layout_marginTop="15dp"
-            android:src="@drawable/disclaimer_top_banner_foreground" />
+            android:src="@drawable/ic_riot_icon" />
 
-        <TextView
+        <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginLeft="24dp"
-            android:layout_marginTop="92dp"
-            android:fontFamily="sans-serif"
-            android:lineSpacingExtra="8sp"
-            android:text="@string/alpha_disclaimer_title"
-            android:textColor="@color/white"
-            android:textSize="24sp"
-            android:textStyle="normal" />
+            android:layout_margin="32dp"
+            android:src="@drawable/ic_arrow_right"
+            android:tint="?riotx_text_secondary" />
 
-    </FrameLayout>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/element_logo_green" />
+
+    </LinearLayout>
 
     <TextView
-        android:layout_width="match_parent"
+        android:id="@+id/disclaimerTextView"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="21dp"
-        android:layout_marginEnd="24dp"
-        android:text="@string/alpha_disclaimer_content_line_1"
+        android:text="@string/element_disclaimer_title"
         android:textColor="?riotx_text_primary"
-        android:textSize="16sp" />
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/disclaimerIconsLayout" />
 
     <TextView
-        android:id="@+id/dialogDisclaimerContentLine2"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="21dp"
+        android:layout_marginTop="32dp"
         android:layout_marginEnd="24dp"
-        android:layout_marginBottom="21dp"
-        android:textColor="?riotx_text_primary"
+        android:gravity="center"
+        android:paddingBottom="32dp"
+        android:text="@string/element_disclaimer_content"
+        android:textColor="?riotx_text_secondary"
         android:textSize="16sp"
-        tools:text="@string/alpha_disclaimer_content_line_2_gplay" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/disclaimerTextView" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 67c6f68551..f0c9438f1a 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -28,7 +28,7 @@
         android:layout_marginTop="8dp"
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
-        android:src="@drawable/ic_eye_black"
+        android:src="@drawable/ic_eye"
         android:tint="?attr/colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/exportDialogTil"
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index 1382caa729..3fa5f4a867 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -58,7 +58,7 @@
                 android:layout_marginTop="8dp"
                 android:background="?attr/selectableItemBackground"
                 android:scaleType="center"
-                android:src="@drawable/ic_eye_black"
+                android:src="@drawable/ic_eye"
                 android:tint="?attr/colorAccent"
                 tools:contentDescription="@string/a11y_show_password" />
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index c26723637b..a0d4960f72 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -50,7 +50,7 @@
         android:layout_marginTop="8dp"
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
-        android:src="@drawable/ic_eye_black"
+        android:src="@drawable/ic_eye"
         android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/bootstrapAccountPasswordTil"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 41a95cbd03..f63a223091 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -70,7 +70,7 @@
         android:layout_marginTop="8dp"
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
-        android:src="@drawable/ic_eye_black"
+        android:src="@drawable/ic_eye"
         android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index ac1b70d2c9..720dd80901 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -70,7 +70,7 @@
         android:layout_marginTop="8dp"
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
-        android:src="@drawable/ic_eye_black"
+        android:src="@drawable/ic_eye"
         android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/bootstrapRecoveryKeyEnterTil"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index 1bf04ba81e..978921ecc9 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -86,7 +86,7 @@
                 android:layout_marginTop="8dp"
                 android:background="?attr/selectableItemBackground"
                 android:scaleType="center"
-                android:src="@drawable/ic_eye_black"
+                android:src="@drawable/ic_eye"
                 android:tint="?attr/colorAccent"
                 tools:contentDescription="@string/a11y_show_password" />
 
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index fa6129054d..75843a2ec6 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -108,6 +108,7 @@
         android:layout_height="48dp"
         android:background="?riotx_background"
         app:itemIconSize="20dp"
+        app:itemIconTint="@color/bottom_navigation_icon_tint_selector"
         app:labelVisibilityMode="unlabeled"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 4e257eabd4..377c3ed17c 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -45,7 +45,7 @@
             android:layout_marginTop="24dp"
             android:maxLines="1"
             android:singleLine="true"
-            android:textColor="@android:color/white"
+            android:textColor="?riotx_text_primary"
             android:textSize="15sp"
             app:layout_constraintEnd_toStartOf="@id/homeDrawerHeaderSettingsView"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
@@ -59,7 +59,7 @@
             android:layout_marginBottom="17dp"
             android:maxLines="1"
             android:singleLine="true"
-            android:textColor="@android:color/white"
+            android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/homeDrawerHeaderSettingsView"
@@ -75,7 +75,7 @@
             android:contentDescription="@string/room_sliding_menu_settings"
             android:padding="16dp"
             android:src="@drawable/ic_settings_x"
-            android:tint="@android:color/white"
+            android:tint="?riotx_text_secondary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
@@ -85,7 +85,7 @@
         android:id="@+id/homeDrawerGroupListContainer"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?riotx_header_panel_background"
+        android:background="?riotx_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index 648687cf4f..fe1e6efe78 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -68,7 +68,7 @@
             android:layout_marginTop="8dp"
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
-            android:src="@drawable/ic_eye_black"
+            android:src="@drawable/ic_eye"
             android:tint="?colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/keys_backup_passphrase_enter_til"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index a0e0ec00b1..eb70487220 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -76,7 +76,7 @@
             android:layout_marginTop="8dp"
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
-            android:src="@drawable/ic_eye_black"
+            android:src="@drawable/ic_eye"
             android:tint="?attr/colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/keys_backup_passphrase_enter_til"
diff --git a/vector/src/main/res/layout/fragment_loading.xml b/vector/src/main/res/layout/fragment_loading.xml
index ae605097cd..7a6a791edf 100644
--- a/vector/src/main/res/layout/fragment_loading.xml
+++ b/vector/src/main/res/layout/fragment_loading.xml
@@ -7,8 +7,8 @@
     <!-- Note: Animation will be started in the code -->
     <ImageView
         android:id="@+id/animatedLogoImageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
         android:background="@drawable/riot_animated_logo"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 8e7fc9e418..d5a7eace58 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -100,7 +100,7 @@
                     android:layout_marginTop="8dp"
                     android:background="?attr/selectableItemBackground"
                     android:scaleType="center"
-                    android:src="@drawable/ic_eye_black"
+                    android:src="@drawable/ic_eye"
                     android:tint="?attr/colorAccent"
                     tools:contentDescription="@string/a11y_show_password" />
 
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index 506afbe519..e50c823ff1 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -90,7 +90,7 @@
                     android:layout_marginTop="8dp"
                     android:background="?attr/selectableItemBackground"
                     android:scaleType="center"
-                    android:src="@drawable/ic_eye_black"
+                    android:src="@drawable/ic_eye"
                     android:tint="?attr/colorAccent"
                     tools:contentDescription="@string/a11y_show_password" />
 
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index de7bf65cbb..fe38f46828 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -104,7 +104,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    android:src="@drawable/ic_logo_modular"
+                    android:src="@drawable/ic_logo_element_matrix_services"
                     android:tint="?riotx_text_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceModularText"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index 5298087e09..0b84c33011 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -21,12 +21,13 @@
             style="@style/LoginFormContainer"
             android:orientation="vertical">
 
+            <!-- Displayed only for EMS -->
             <ImageView
                 android:id="@+id/loginServerUrlFormIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_logo_modular"
+                android:src="@drawable/ic_logo_element_matrix_services"
                 android:tint="?riotx_text_primary" />
 
             <TextView
@@ -81,7 +82,7 @@
                 android:layout_marginTop="6dp"
                 android:gravity="start"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                tools:text="@string/login_server_url_form_modular_notice" />
+                tools:text="@string/login_server_url_form_common_notice" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginServerUrlFormSubmit"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 44a81df539..2a43ece5ec 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -20,38 +20,49 @@
 
             <ImageView
                 android:id="@+id/loginSplashLogo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/riotx_logo"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:src="@drawable/element_logo_green"
                 android:transitionName="loginLogoTransition"
-                app:layout_constraintBottom_toTopOf="@+id/loginSplashTitle"
+                app:layout_constraintBottom_toTopOf="@+id/logoType"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_chainStyle="packed" />
 
+            <ImageView
+                android:id="@+id/logoType"
+                android:layout_width="wrap_content"
+                android:layout_height="44dp"
+                android:layout_marginTop="8dp"
+                android:src="@drawable/element_logotype"
+                android:tint="?colorAccent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginSplashLogo" />
+
             <TextView
                 android:id="@+id/loginSplashTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="48dp"
+                android:layout_marginTop="32dp"
+                android:gravity="center"
                 android:text="@string/login_splash_title"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Title"
                 android:transitionName="loginTitleTransition"
                 app:layout_constraintBottom_toTopOf="@+id/loginSplashText1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSplashLogo" />
+                app:layout_constraintTop_toBottomOf="@+id/logoType" />
 
-            <!-- TODO check relative dimension -->
             <ImageView
                 android:id="@+id/loginSplashPicto1"
-                android:layout_width="wrap_content"
+                android:layout_width="32dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="2dp"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_login_splash_message_circle"
-                android:tint="?vctr_notice_secondary"
+                android:tint="?riotx_text_secondary"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/loginSplashText1" />
 
@@ -59,63 +70,60 @@
                 android:id="@+id/loginSplashText1"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="36dp"
-                android:layout_marginTop="32dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="96dp"
                 android:gravity="start"
                 android:text="@string/login_splash_text1"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                 app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
                 app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle" />
 
             <ImageView
                 android:id="@+id/loginSplashPicto2"
-                android:layout_width="wrap_content"
+                android:layout_width="32dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_login_splash_lock"
-                android:tint="?vctr_notice_secondary"
-                app:layout_constraintStart_toStartOf="parent"
+                android:tint="?riotx_text_secondary"
+                app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
                 app:layout_constraintTop_toTopOf="@+id/loginSplashText2" />
 
             <TextView
                 android:id="@+id/loginSplashText2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="36dp"
                 android:layout_marginTop="16dp"
                 android:gravity="start"
                 android:text="@string/login_splash_text2"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                 app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@id/loginSplashText1"
                 app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" />
 
             <ImageView
                 android:id="@+id/loginSplashPicto3"
-                android:layout_width="wrap_content"
+                android:layout_width="32dp"
                 android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_login_splash_sliders"
-                android:tint="?vctr_notice_secondary"
-                app:layout_constraintStart_toStartOf="parent"
+                android:tint="?riotx_text_secondary"
+                app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
                 app:layout_constraintTop_toTopOf="@+id/loginSplashText3" />
 
             <TextView
                 android:id="@+id/loginSplashText3"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="36dp"
                 android:layout_marginTop="16dp"
                 android:gravity="start"
                 android:text="@string/login_splash_text3"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text"
                 app:layout_constraintBottom_toTopOf="@+id/loginSplashSubmit"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
                 app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/vector/src/main/res/layout/fragment_room_widget.xml b/vector/src/main/res/layout/fragment_room_widget.xml
index 4c1e5bb4a3..f336f6b6e9 100644
--- a/vector/src/main/res/layout/fragment_room_widget.xml
+++ b/vector/src/main/res/layout/fragment_room_widget.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         android:orientation="horizontal"
         android:padding="16dp"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 7ac0ffbdcd..005de93cf6 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -83,7 +83,7 @@
             android:layout_marginTop="8dp"
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
-            android:src="@drawable/ic_eye_black"
+            android:src="@drawable/ic_eye"
             android:tint="?colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til"
diff --git a/vector/src/main/res/layout/item_divider.xml b/vector/src/main/res/layout/item_divider.xml
index f4fbf87b39..8d7be0b620 100644
--- a/vector/src/main/res/layout/item_divider.xml
+++ b/vector/src/main/res/layout/item_divider.xml
@@ -3,5 +3,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="1dp"
-    android:background="?attr/vctr_list_bottom_sheet_divider_color"
+    android:background="?riotx_list_bottom_sheet_divider_color"
     tools:layout_height="100dp" />
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index 075cbe6da5..7331c31dfd 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -5,7 +5,7 @@
     android:id="@+id/item_generic_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/colorBackground"
+    android:background="?riotx_background"
     android:minHeight="50dp">
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_login_header.xml b/vector/src/main/res/layout/item_login_header.xml
index 333d15ed81..d033c4f9f9 100644
--- a/vector/src/main/res/layout/item_login_header.xml
+++ b/vector/src/main/res/layout/item_login_header.xml
@@ -6,4 +6,4 @@
     android:layout_gravity="center_horizontal"
     android:layout_marginTop="32dp"
     android:importantForAccessibility="no"
-    android:src="@drawable/riotx_logo" />
+    android:src="@drawable/element_logo_green" />
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index 614a727d2a..759da76a0d 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -43,7 +43,7 @@
             android:layout_marginTop="8dp"
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
-            android:src="@drawable/ic_eye_black"
+            android:src="@drawable/ic_eye"
             android:tint="?attr/colorAccent"
             tools:contentDescription="@string/a11y_show_password" />
 
diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 13b70c4243..74cc63e5be 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -22,7 +22,7 @@
         android:background="?riotx_background"
         android:paddingStart="32dp"
         android:paddingEnd="32dp"
-        android:textColor="?riotx_header_panel_text_primary"
+        android:textColor="?riotx_header_panel_text_secondary"
         android:textSize="15sp"
         tools:text="@tools:sample/date/day_of_week" />
 
diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml
index cd63366197..652458b7f5 100644
--- a/vector/src/main/res/layout/merge_composer_layout.xml
+++ b/vector/src/main/res/layout/merge_composer_layout.xml
@@ -15,21 +15,21 @@
         android:id="@+id/related_message_backround"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_color"
+        android:background="?riotx_bottom_nav_background_color"
         tools:ignore="MissingConstraints" />
 
     <View
         android:id="@+id/related_message_background_top_separator"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         tools:ignore="MissingConstraints" />
 
     <View
         android:id="@+id/related_message_background_bottom_separator"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?vctr_bottom_nav_background_border_color"
+        android:background="?riotx_bottom_nav_background_border_color"
         tools:ignore="MissingConstraints" />
 
     <ImageView
diff --git a/vector/src/main/res/layout/merge_overlay_waiting_view.xml b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
index 3ee572cd71..10ae1a7ae2 100644
--- a/vector/src/main/res/layout/merge_overlay_waiting_view.xml
+++ b/vector/src/main/res/layout/merge_overlay_waiting_view.xml
@@ -9,7 +9,7 @@
         android:id="@+id/waiting_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?vctr_waiting_background_color"
+        android:background="?riotx_waiting_background_color"
         android:clickable="true"
         android:focusable="true"
         android:visibility="gone"
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index 2fe2464f77..db84db6622 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -15,6 +15,7 @@
     <item
         android:id="@+id/menu_home_filter"
         android:icon="@drawable/ic_search"
+        app:iconTint="?riotx_text_secondary"
         android:title="@string/home_filter_placeholder_home"
         app:showAsAction="always" />
 
diff --git a/vector/src/main/res/menu/home_bottom_navigation.xml b/vector/src/main/res/menu/home_bottom_navigation.xml
index 805e93744a..d52c8afab3 100644
--- a/vector/src/main/res/menu/home_bottom_navigation.xml
+++ b/vector/src/main/res/menu/home_bottom_navigation.xml
@@ -16,7 +16,7 @@
     <item
         android:id="@+id/bottom_action_notification"
         android:enabled="true"
-        android:icon="@drawable/ic_bell"
+        android:icon="@drawable/ic_settings_root_notification"
         android:title="@string/bottom_action_notification"
         android:visible="false" />
 
diff --git a/vector/src/main/res/menu/vector_room_profile.xml b/vector/src/main/res/menu/vector_room_profile.xml
index f6331018f0..245ad0c0c8 100644
--- a/vector/src/main/res/menu/vector_room_profile.xml
+++ b/vector/src/main/res/menu/vector_room_profile.xml
@@ -5,6 +5,6 @@
         android:id="@+id/roomProfileShareAction"
         android:icon="@drawable/ic_material_share"
         android:title="@string/share"
-        app:iconTint="?attr/colorAccent"
+        app:iconTint="?attr/riotx_text_secondary"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher.png b/vector/src/main/res/mipmap-hdpi/ic_launcher.png
index 90a6b5977b..61989aa188 100644
Binary files a/vector/src/main/res/mipmap-hdpi/ic_launcher.png and b/vector/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 5c205f3069..1e70007a5a 100644
Binary files a/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher.png b/vector/src/main/res/mipmap-mdpi/ic_launcher.png
index b499d124f5..a8cb1278e2 100644
Binary files a/vector/src/main/res/mipmap-mdpi/ic_launcher.png and b/vector/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png
index ac9d4d9b31..a84a5c7f0f 100644
Binary files a/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher.png
index 5b393bca8a..8a58336ca4 100644
Binary files a/vector/src/main/res/mipmap-xhdpi/ic_launcher.png and b/vector/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 269e47d393..a16d061d32 100644
Binary files a/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 77c7c2351d..ef4922fc1d 100644
Binary files a/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/vector/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 46c7034c71..75e42278dc 100644
Binary files a/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 6ec8243ec9..fd6271c31d 100644
Binary files a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 5246c81971..14c5fe404a 100644
Binary files a/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/vector/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index b6ee3a329d..972e695515 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -63,7 +63,7 @@
     <string name="local_address_book_header">دفتر العناوين المحلي</string>
     <string name="matrix_only_filter">متراسلو «ماترِكس» فقط</string>
     <string name="no_conversation_placeholder">لا محادثات</string>
-    <string name="no_contact_access_placeholder">لم تسمح لِ‍ Riot بمطالعة متراسليك المحليين</string>
+    <string name="no_contact_access_placeholder">لم تسمح لِ‍ Element بمطالعة متراسليك المحليين</string>
     <string name="no_result_placeholder">لا نتائج</string>
 
     <string name="rooms_header">الغرف</string>
@@ -558,20 +558,20 @@
     <string name="call_error_ice_failed">فشل اتصال الوسائط</string>
     <string name="call_error_answered_elsewhere">رُدّ على المكالة في مكان آخر</string>
 
-    <string name="permissions_rationale_msg_storage">يحتاج Riot تصريحا منك للوصول إلى مكتبتي الصور والفديو لإرسال المرفقات وحفظها.
+    <string name="permissions_rationale_msg_storage">يحتاج Element تصريحا منك للوصول إلى مكتبتي الصور والفديو لإرسال المرفقات وحفظها.
 
 رجاءً اسمح بالوصول في المنبثقة التالية لتقدر على إرسال الملفات من هاتفك.</string>
-    <string name="permissions_rationale_msg_camera">يحتاج Riot تصريحا منك للوصول إلى الكمرة لأخذ الصور وللمكالمات الصورية.</string>
-    <string name="permissions_rationale_msg_record_audio">يحتاج Riot تصريحا منك للوصول إلى المِكرفون لإجراء المكالمات الصوتية.</string>
+    <string name="permissions_rationale_msg_camera">يحتاج Element تصريحا منك للوصول إلى الكمرة لأخذ الصور وللمكالمات الصورية.</string>
+    <string name="permissions_rationale_msg_record_audio">يحتاج Element تصريحا منك للوصول إلى المِكرفون لإجراء المكالمات الصوتية.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 رجاءً اسمح بالنفاذ في المنبثقة الآتية لتتمكن من إجراء محادثة.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">يحتاج Riot تصريحا منك للوصول إلى الكمرة والمِكرفون لإجراء المكالمات الصورية.
+    <string name="permissions_rationale_msg_camera_and_audio">يحتاج Element تصريحا منك للوصول إلى الكمرة والمِكرفون لإجراء المكالمات الصورية.
 
 رجاءً اسمح بالوصول في المنبثقة التالية لتقدر على إرسال إجراء المكالمات الصورية.</string>
-    <string name="permissions_rationale_msg_contacts">يحتاج Riot تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
+    <string name="permissions_rationale_msg_contacts">يحتاج Element تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
 
-رجاءً اسمح بالوصول في المنبثقة التالية لتستكشف مستخدميك في دفتر العناوين من Riot.</string>
+رجاءً اسمح بالوصول في المنبثقة التالية لتستكشف مستخدميك في دفتر العناوين من Element.</string>
     <string name="media_slider_saved">حُفظت</string>
     <string name="preview">عايِن</string>
     <string name="room_sync_in_progress">يُزامن…</string>
@@ -587,9 +587,9 @@
 
     <string name="compression_opt_list_original">الأصلي</string>
     <string name="call_error_user_not_responding">لم يُجب الطرف البعيد.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">يحتاج Riot تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
+    <string name="permissions_msg_contacts_warning_other_androids">يحتاج Element تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
 
-أتسمح بأن يصل Riot إلى متراسليك؟</string>
+أتسمح بأن يصل Element إلى متراسليك؟</string>
 
     <string name="room_participants_header_direct_chats">الدردشات المباشرة</string>
     <string name="room_participants_invite_search_another_user">معرّف المستخدم أو اسمه أو بريده</string>
@@ -764,7 +764,7 @@
 
 الأجهزة المجهولة:</string>
 
-    <string name="e2e_enabling_on_app_update">بات يدعم Riot تعمية الطرفين، ولكن عليك الولوج مجددا لتفعيلها.
+    <string name="e2e_enabling_on_app_update">بات يدعم Element تعمية الطرفين، ولكن عليك الولوج مجددا لتفعيلها.
 
 يمكنك فعل ذلك الآن أو لاحقا وذلك من إعدادات التطبيق.</string>
 
@@ -864,7 +864,7 @@
     <string name="e2e_re_request_encryption_key_sent">أُرسل طلب المفتاح.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">أُرسل الطلب</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">رجاءً أطلِق Riot في جهاز آخر يقدر على فك تعمية الرسالة ليُرسل المفاتيح إلى هذا الجهاز.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">رجاءً أطلِق Element في جهاز آخر يقدر على فك تعمية الرسالة ليُرسل المفاتيح إلى هذا الجهاز.</string>
 
     <string name="speak">انطِق</string>
     <string name="clear">امسح</string>
@@ -892,8 +892,8 @@
     <string name="startup_notification_privacy_button_other">اختر خيارا آخر</string>
 
     <string name="settings_opt_in_of_analytics">أرسِل بيانات التحاليل</string>
-    <string name="settings_opt_in_of_analytics_summary">يجمع Riot التحاليل بشكل مجهّل فيتيح لنا ذلك تحسين التطبيق.</string>
-    <string name="settings_opt_in_of_analytics_prompt">رجاءً فعّل التحاليل لمساعدتنا في تحسين Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">يجمع Element التحاليل بشكل مجهّل فيتيح لنا ذلك تحسين التطبيق.</string>
+    <string name="settings_opt_in_of_analytics_prompt">رجاءً فعّل التحاليل لمساعدتنا في تحسين Element.</string>
     <string name="settings_opt_in_of_analytics_ok">نعم أريد المساعدة!</string>
 
     <string name="lock_screen_hint">اكتب هنا…</string>
@@ -968,7 +968,7 @@
 
     <string name="settings_preview_media_before_sending">عايِن الوسيط قبل إرساله</string>
 
-    <string name="startup_notification_privacy_message">يمكن أن يعمل Riot في الخلفية ليُدير الإخطارات بأمان وخصوصية (قد يؤثّر هذا على استهلاك البطارية).</string>
+    <string name="startup_notification_privacy_message">يمكن أن يعمل Element في الخلفية ليُدير الإخطارات بأمان وخصوصية (قد يؤثّر هذا على استهلاك البطارية).</string>
     <string name="settings_without_flair">لست عضوًا في أي مجتمع حاليًا.</string>
 
     <plurals name="notification_unread_notified_messages">
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index 8bce8a32ff..33dae7f725 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -184,7 +184,7 @@
     <string name="room_info_room_topic">Tema sobe</string>
 
     <string name="settings_call_category">Pozivi</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Koristi podrazumevani Riot zvuk zvona za dolazeće pozive</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Koristi podrazumevani Element zvuk zvona za dolazeće pozive</string>
     <string name="settings_call_ringtone_title">Zvuk zvona dolazećeg poziva</string>
     <string name="settings_call_ringtone_dialog_title">Izaberite zvuk zvona za pozive:</string>
 
@@ -214,7 +214,7 @@
 
     <string name="settings_troubleshoot_test_service_boot_success">Servis će se početi sa radom prilikom ponovnog pokretanja uređaja.</string>
     <string name="settings_troubleshoot_test_battery_title">Optimizacija potrošnje baterije</string>
-    <string name="settings_troubleshoot_test_battery_success">Optimizacija potrošnje baterije ne utiče na Riot.</string>
+    <string name="settings_troubleshoot_test_battery_success">Optimizacija potrošnje baterije ne utiče na Element.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriši optimizacije</string>
 
     <string name="settings_notification_privacy_normal">Normalno</string>
@@ -271,7 +271,7 @@
     <string name="settings_discovery_category">Pronalaženje</string>
     <string name="settings_discovery_manage">Upravljajte vašim podešavanjima za pronalaženje.</string>
     <string name="startup_notification_privacy_title">Privatnost obaveštenja</string>
-    <string name="startup_notification_privacy_message">Riot može da radi u pozadini kako bi upravljao vašim obaveštenjima sigurno i privatno. Ovo može da utiče na potrošnju baterije.</string>
+    <string name="startup_notification_privacy_message">Element može da radi u pozadini kako bi upravljao vašim obaveštenjima sigurno i privatno. Ovo može da utiče na potrošnju baterije.</string>
     <string name="startup_notification_privacy_button_grant">Dozvoli</string>
     <string name="startup_notification_privacy_button_other">Izaberi drugu opciju</string>
 
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index e7f34ebbec..6a9189b84a 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -152,7 +152,7 @@
     <string name="user_directory_header">Директория с потребители</string>
     <string name="matrix_only_filter">Само потребители на Matrix</string>
     <string name="no_conversation_placeholder">Няма разговори</string>
-    <string name="no_contact_access_placeholder">Не сте дали достъп на Riot до локалните ви контакти</string>
+    <string name="no_contact_access_placeholder">Не сте дали достъп на Element до локалните ви контакти</string>
     <string name="no_result_placeholder">Няма резултати</string>
 
     <string name="rooms_header">Стаи</string>
@@ -623,7 +623,7 @@
     <string name="encryption_information_verify_device_warning2">Ако съвпада, моля натиснете бутона за потвърждение по-долу. Ако не съвпада, то тогава някой друг имитира това устройство и вероятно бихте искали да го вкарате в черния списък. В бъдеще този процес на потвърждение ще бъде по-лесен.</string>
     <string name="encryption_information_verify_key_match">Потвърждавам, че ключовете съвпадат</string>
 
-    <string name="e2e_enabling_on_app_update">Riot поддържа шифроване от край до край, но за да го включите трябва да влезете в профила си отново.
+    <string name="e2e_enabling_on_app_update">Element поддържа шифроване от край до край, но за да го включите трябва да влезете в профила си отново.
 
 Може да го направите сега или по-късно от настройките на приложението.</string>
 
@@ -665,24 +665,24 @@
     <string name="widget_integration_missing_user_id">Липсва user_id в заявката.</string>
     <string name="widget_integration_room_not_visible">Стая %s не е видима.</string>
     <string name="room_add_matrix_apps">Добави Matrix приложения</string>
-    <string name="permissions_rationale_msg_storage">Riot иска разрешение за достъп до Вашата галерия със снимки и видеа, за да изпраща и запазва прикачени файлове.
+    <string name="permissions_rationale_msg_storage">Element иска разрешение за достъп до Вашата галерия със снимки и видеа, за да изпраща и запазва прикачени файлове.
 
 Моля, разрешете достъпа от следващия прозорец, който се покаже, за да можете да изпращате файлове от телефона си.</string>
-    <string name="permissions_rationale_msg_camera">Riot иска разшерение за достъп до Вашата камера, за да прави снимки или да осъществи видео разговори.</string>
+    <string name="permissions_rationale_msg_camera">Element иска разшерение за достъп до Вашата камера, за да прави снимки или да осъществи видео разговори.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Моля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да се обадите.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot иска разшерение за достъп до Вашия микрофон, за да се извърши звуков разговор.</string>
+    <string name="permissions_rationale_msg_record_audio">Element иска разшерение за достъп до Вашия микрофон, за да се извърши звуков разговор.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Моля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да се обадите.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot иска разшерение за достъп до микрофона и камерата Ви, за да извърши видео разговор.
+    <string name="permissions_rationale_msg_camera_and_audio">Element иска разшерение за достъп до микрофона и камерата Ви, за да извърши видео разговор.
 
 Моля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да се обадите.</string>
-    <string name="permissions_rationale_msg_contacts">Riot може да провери контактите ви, за да намери други Matrix потребители по имейл или телефонен номер.
+    <string name="permissions_rationale_msg_contacts">Element може да провери контактите ви, за да намери други Matrix потребители по имейл или телефонен номер.
 \n
 \nАко сте съгласни да споделите списъка с контактите си за тази цел, моля разрешете достъп при предстоящото запитване.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot може да провери контактите ви, за да намери други Matrix потребители по имейл и телефонен номер.
+    <string name="permissions_msg_contacts_warning_other_androids">Element може да провери контактите ви, за да намери други Matrix потребители по имейл и телефонен номер.
 \n
 \nРазрешавате ли да се сподели списъка с контакти за тази цел\?</string>
 
@@ -833,7 +833,7 @@
     <string name="settings_notification_privacy_message_content_not_shown">• Уведомленията <b>няма да показват съдържания на съобщения</b></string>
 
     <string name="startup_notification_privacy_title">Конфиденциалност на известията</string>
-    <string name="startup_notification_privacy_message">Riot може да работи във фонов режим за да получава известия по защитен начин. Може да повлияе на консумацията на енергия.</string>
+    <string name="startup_notification_privacy_message">Element може да работи във фонов режим за да получава известия по защитен начин. Може да повлияе на консумацията на енергия.</string>
     <string name="startup_notification_privacy_button_grant">Разреши достъп</string>
     <string name="startup_notification_privacy_button_other">Избери друг вариант</string>
 
@@ -850,8 +850,8 @@
     <string name="settings_deactivate_my_account">Деактивирай акаунта ми</string>
 
     <string name="settings_opt_in_of_analytics">Изпращане на статистически данни</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot събира анонимни статистики за да ни помогне да подобрим приложението.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Моля, включете изпращането на статистики за да ни помогнете да подобрим Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element събира анонимни статистики за да ни помогне да подобрим приложението.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Моля, включете изпращането на статистики за да ни помогнете да подобрим Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Да, искам да помогна!</string>
 
     <string name="widget_integration_missing_parameter">Липсва задължителен параметър.</string>
@@ -879,7 +879,7 @@
     <string name="e2e_re_request_encryption_key_sent">Заявката за ключове беше изпратена.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Изпратена заявка</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Моля стартирайте Riot на друго устройство можещо да разшифрова съобщението, за да може то да изпрати ключовете до това устройство.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Моля стартирайте Element на друго устройство можещо да разшифрова съобщението, за да може то да изпрати ключовете до това устройство.</string>
 
     <string name="lock_screen_hint">Пишете тук…</string>
 
@@ -1006,7 +1006,7 @@
     <string name="auth_accept_policies">Моля прегледайте и приемете политиките на сървъра:</string>
 
     <string name="settings_call_category">Обаждания</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Използвай мелодията по подразбиране на Riot за входящи повиквания</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Използвай мелодията по подразбиране на Element за входящи повиквания</string>
     <string name="settings_call_ringtone_title">Мелодия за входящо повикване</string>
     <string name="settings_call_ringtone_dialog_title">Избор на мелодия за обаждания:</string>
 
@@ -1057,12 +1057,12 @@
     <string name="settings_troubleshoot_test_device_settings_title">Настройки на устройството.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомленията са разрешени за това устройство.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Уведомленията са забранени за това устройство.
-Моля, проверете настройките на Riot.</string>
+Моля, проверете настройките на Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Разреши</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Проверка на Google Play услугите</string>
     <string name="settings_troubleshoot_test_play_services_success">APK пакет за Google Play услугите е наличен и с актуална версия.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot използва Google Play услугите за да доставя известия за съобщения, но изглежда те не са конфигурирани правилно:
+    <string name="settings_troubleshoot_test_play_services_failed">Element използва Google Play услугите за да доставя известия за съобщения, но изглежда те не са конфигурирани правилно:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Поправи Google Play услугите</string>
 
@@ -1089,25 +1089,25 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Стартирай при старт на системата</string>
     <string name="settings_troubleshoot_test_service_boot_success">Услугата ще стартира когато устройството се рестартира.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Услугата няма да стартира когато устройството се рестартира. Няма да получавате известия докато Riot не бъде отворен поне веднъж.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Услугата няма да стартира когато устройството се рестартира. Няма да получавате известия докато Element не бъде отворен поне веднъж.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Стартирай при старт на системата</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Проверка на фоновите ограничения</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Ограниченията във фонов режим са изключени за Riot. Тази проверка трябва да се изпълни използвайки мобилни данни (не на Wi-Fi).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Ограниченията във фонов режим са изключени за Element. Тази проверка трябва да се изпълни използвайки мобилни данни (не на Wi-Fi).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Активирани са ограничения във фонов режим за Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Активирани са ограничения във фонов режим за Element.
 Работата, която приложението се опитва да извършва във фонов режим бива агресивно ограничена. Това може да повлияе на известяването.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Премахни ограниченията</string>
 
     <string name="settings_troubleshoot_test_battery_title">Оптимизация на батерията</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot не се влияе от Оптимизация на батерията.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element не се влияе от Оптимизация на батерията.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ако потребител остави устройството неподвижно с изключен екран за известно време, то влиза в режим на заспиване. Това предотвратява приложенията да достъпват мрежата и отлага техните задачи, синхронизации и стандартни аларми.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Игнорирай оптимизацията</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Връзка във фонов режим</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot трябва да поддържа ниско-натоварваща връзка във фонов режим, за да може известията да пристигат надеждно.
-На следващия екран, ще бъдете попитани дали да позволите на Riot винаги да работи във фонов режим. Моля, приемете.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element трябва да поддържа ниско-натоварваща връзка във фонов режим, за да може известията да пристигат надеждно.
+На следващия екран, ще бъдете попитани дали да позволите на Element винаги да работи във фонов режим. Моля, приемете.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Разреши</string>
 
     <string name="account_email_error">Възникна грешка при проверката на имейл адреса Ви.</string>
@@ -1117,17 +1117,17 @@
 
     <string name="no_valid_google_play_services_apk">Не беше открит валиден APK пакет за Google Play услугите. Уведомленията може да не работят правилно.</string>
 
-    <string name="store_title">Riot.im - комуникирайте по свой начин</string>
+    <string name="store_title">Element - комуникирайте по свой начин</string>
     <string name="store_short_description">Универсален и сигурен чат изцяло под ваш контрол.</string>
-    <string name="store_full_description">"Чат приложение, което е изцяло гъвкаво и под Ваш контрол. Riot позволява да комуникирате по начина, по който искате. Направено за [matrix] - стандарт за отворена и децентрализирана комуникация.
+    <string name="store_full_description">"Чат приложение, което е изцяло гъвкаво и под Ваш контрол. Element позволява да комуникирате по начина, по който искате. Направено за [matrix] - стандарт за отворена и децентрализирана комуникация.
 
 Използвайте безплатен matrix.org акаунт, собствен сървър от https://modular.im или друг Matrix сървър.
 
-Защо да изберете Riot.im?
+Защо да изберете Element?
 
 • ПЪЛНА КОМУНИКАЦИЯ: Създавайте каквито пожелаете чат стаи - свързани с работни екипи, приятели или друг вид общности! Чатете, споделяйте файлове, добавяйте приспособления и водете аудио и видео разговори - всичко това, изцяло безплатно.
 
-• МОЩНИ ИНТЕГРАЦИИ: Използвайте Riot.im с досега-познатите Ви инструменти. Посредством Riot.im дори можете да чатите с потребители и групи използващи други чат приложения.
+• МОЩНИ ИНТЕГРАЦИИ: Използвайте Element с досега-познатите Ви инструменти. Посредством Element дори можете да чатите с потребители и групи използващи други чат приложения.
 
 • ЛИЧНО И ЗАЩИТЕНО: Пазете комуникацията си в тайна. Съвременна технология за шифроване от край до край гарантира, че Вашата комуникацията наистина остава Ваша.
 
@@ -1137,7 +1137,7 @@
 
     <string name="video_call_in_progress">В момента тече видео разговор…</string>
 
-    <string name="store_whats_new">"Постоянно правим промени и подобрения по Riot.im.
+    <string name="store_whats_new">"Постоянно правим промени и подобрения по Element.
 Пълният списък с промени може да бъде намерен тук: %1$s.
 За да сте сигурни, че няма да пропуснете нищо, просто оставете автоматичните обновления включени."</string>
     <string name="title_activity_keys_backup_setup">Резервно копие на ключовете</string>
@@ -1158,11 +1158,11 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Провери настройките</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Тази грешка е извън контрола на Riot. Според Google, грешката показва, че устройството има прекалено много приложения регистрирани към системата за известия FCM. Проблема се случва само в случай на огромен брой приложения, така че не би трябвало да повлияе средно-статистическия потребител.</string>
+Тази грешка е извън контрола на Element. Според Google, грешката показва, че устройството има прекалено много приложения регистрирани към системата за известия FCM. Проблема се случва само в случай на огромен брой приложения, така че не би трябвало да повлияе средно-статистическия потребител.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-Тази грешка е извън контрола на Riot. Може да се случи поради няколко причини. Възможно е проблема да изчезне, ако опитате по-късно. Също така, може да проверите дали Google Play услугите не са ограничени откъм мобилни данни (вижте системните настройки), или че часовникът на устройството е правилен. Възможно е грешката да възникне и ако използвате модифицирана операционна система (custom ROM).</string>
+Тази грешка е извън контрола на Element. Може да се случи поради няколко причини. Възможно е проблема да изчезне, ако опитате по-късно. Също така, може да проверите дали Google Play услугите не са ограничени откъм мобилни данни (вижте системните настройки), или че часовникът на устройството е правилен. Възможно е грешката да възникне и ако използвате модифицирана операционна система (custom ROM).</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Тази грешка е извън контрола на Riot. Няма Google акаунт на телефонът. Отворете системата за управления на акаунти и добавете Google акаунт.</string>
+Тази грешка е извън контрола на Element. Няма Google акаунт на телефонът. Отворете системата за управления на акаунти и добавете Google акаунт.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Добави акаунт</string>
 
     <string name="settings_noisy_notifications_preferences">Настройка на шумни известия</string>
@@ -1178,7 +1178,7 @@
     <string name="passphrase_empty_error_message">Моля, въведете парола</string>
     <string name="passphrase_passphrase_too_weak">Паролата е прекалено слаба</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Моля, изтрийте паролата, ако искате Riot да генерира ключ за възстановяване.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Моля, изтрийте паролата, ако искате Element да генерира ключ за възстановяване.</string>
     <string name="keys_backup_no_session_error">Не беше открита Matrix сесия</string>
 
     <string name="keys_backup_setup_step1_title">Никога не губете шифровани съобщения</string>
@@ -1341,7 +1341,7 @@
 
     <string name="autodiscover_invalid_response">Невалиден отговор при опит за откриване на адреса на сървъра</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Опции за откриване на сървър</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot откри конфигурация за собствен сървър за домейна от потребителското Ви име \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element откри конфигурация за собствен сървър за домейна от потребителското Ви име \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Използвай конфигурацията</string>
 
@@ -1482,7 +1482,7 @@
     <string name="group_all_communities">Всички общности</string>
 
     <string name="room_preview_no_preview">Тази стая не може да бъде прегледана</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Прегледа на стаи четими от цял свят все още не се поддържа от RiotX</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Прегледа на стаи четими от цял свят все още не се поддържа от ElementX</string>
 
     <string name="fab_menu_create_room">Стаи</string>
     <string name="fab_menu_create_chat">Директни съобщения</string>
@@ -1499,7 +1499,7 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">Случи се грешка при извличане на резервните данни за ключовете</string>
 
     <string name="alpha_disclaimer_title">Добре дошли в beta версията!</string>
-    <string name="alpha_disclaimer_content_line_1">Докато RiotX е в ранен стадий на разработка някои функции може да липсват или да има бъгове.</string>
+    <string name="alpha_disclaimer_content_line_1">Докато Element е в ранен стадий на разработка някои функции може да липсват или да има бъгове.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store описанието</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Ако намерите бъгове, моля докладвайте ги от най-горното ляво меню на началния екран и ще ги разрешим възможно най-бързо.</string>
 
@@ -1541,15 +1541,15 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">Показвай скрити събития в чата</string>
 
-    <string name="store_riotx_title">RiotX - следващо поколение Matrix клиент</string>
+    <string name="store_riotx_title">Element - следващо поколение Matrix клиент</string>
     <string name="store_riotx_short_description">По-бърз и по-лек Matrix клиент, използващ последните Android технологии</string>
-    <string name="store_riotx_full_description">RiotX в нов клиент за Matrix протокола (Matrix.org): отворена мрежа за сигурна, децентрализирана комуникация. RiotX е изцяло пренаписан Riot Android клиент, базиран на изцяло пренаписан Matrix Android SDK.
+    <string name="store_riotx_full_description">Element в нов клиент за Matrix протокола (Matrix.org): отворена мрежа за сигурна, децентрализирана комуникация. Element е изцяло пренаписан Riot Android клиент, базиран на изцяло пренаписан Matrix Android SDK.
 \n
-\nЗабележка: Това е бета версия. RiotX в момента се разработва активно и все още има ограничения и (надяваме се не прекалено много) бъгове. Всякаква обратна връзка е добре дошла!
+\nЗабележка: Това е бета версия. Element в момента се разработва активно и все още има ограничения и (надяваме се не прекалено много) бъгове. Всякаква обратна връзка е добре дошла!
 \n
-\nRiotX поддържа: • Вход в съществуващ акаунт • Създаване на стая и влизане в публични стаи • Приемане и отхвърляне на покани • Показване на списък със стаите • Преглеждане на информация за стая • Изпращане на текстови съобщения • Изпращане на прикачени файлове • Четене и писане на съобщения в шифровани стаи • Шифроване: резервни копия на E2E ключове, потвърждение на устройства, заявяване и отговаряне на заявки за споделяне на ключове • Уведомления • Светла, Тъмна и Черна тема
+\nElement поддържа: • Вход в съществуващ акаунт • Създаване на стая и влизане в публични стаи • Приемане и отхвърляне на покани • Показване на списък със стаите • Преглеждане на информация за стая • Изпращане на текстови съобщения • Изпращане на прикачени файлове • Четене и писане на съобщения в шифровани стаи • Шифроване: резервни копия на E2E ключове, потвърждение на устройства, заявяване и отговаряне на заявки за споделяне на ключове • Уведомления • Светла, Тъмна и Черна тема
 \n
-\nЗасега не всички функции на Riot са налични в RiotX. Основни липсващи (и скоро пристигащи!) функции са: • Настройки на стаи (показване на членове и т.н.) • Обаждания • Приспособления • …</string>
+\nЗасега не всички функции на Element са налични в Element. Основни липсващи (и скоро пристигащи!) функции са: • Настройки на стаи (показване на членове и т.н.) • Обаждания • Приспособления • …</string>
 
     <string name="bottom_action_people_x">Директни съобщения</string>
 
@@ -1601,7 +1601,7 @@
 
     <string name="widget_integration_review_terms">За да продължите трябва да приемете условията за използване на услугата.</string>
 
-    <string name="security_warning_identity_server">Предишни версии на Riot имат проблем със сигурността, давайки достъп на сървъра за самоличност (%1$s) до профила ви. Ако се доверявате на %2$s, може да игнорирате проблема; в противен случай, излезте от профила си и влезте наново.
+    <string name="security_warning_identity_server">Предишни версии на Element имат проблем със сигурността, давайки достъп на сървъра за самоличност (%1$s) до профила ви. Ако се доверявате на %2$s, може да игнорирате проблема; в противен случай, излезте от профила си и влезте наново.
 \n
 \nНаучете повече подробности тук:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1637,11 +1637,11 @@
     <string name="invite_no_identity_server_error">Добавете сървър за самоличност в настройки за да извършите това действие.</string>
     <string name="settings_background_fdroid_sync_mode">Режим на фонова синхронизация (експериментално)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Пестящ батерия</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot ще синхронизира във фонов режим по начин, който пести ограничените ресурси на устройството (батерия).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element ще синхронизира във фонов режим по начин, който пести ограничените ресурси на устройството (батерия).
 \nВ зависимост от състоянието на ресурсите, синхронизацията може да бъде отложена от операционната система.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Целящ висока интерактивност</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot ще синхронизира във фонов режим на определен интервал (конфигурируемо).
-\nТова ще повлияе на използването на антената и батерията. Ще се показва перманентна нотификация, че Riot слуша за събития.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element ще синхронизира във фонов режим на определен интервал (конфигурируемо).
+\nТова ще повлияе на използването на антената и батерията. Ще се показва перманентна нотификация, че Element слуша за събития.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Без фонова синхронизация</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Няма да бъдете уведомени за входящи съобщения, когато приложението е във фонов режим.</string>
     <string name="settings_background_sync_update_error">Неуспешно обновяване на настройките.</string>
@@ -1744,7 +1744,7 @@
 \n
 \nАко не искате да виждате повече съдържание от този потребител, може да го блокирате за да скриете съобщенията му</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot се нуждае от привилегии за да запази E2E ключовете върху диска.
+    <string name="permissions_rationale_msg_keys_backup_export">Element се нуждае от привилегии за да запази E2E ключовете върху диска.
 \n
 \nПозволете достъп на следващия екран, за да може в бъдеще да експортирате ключовете си ръчно.</string>
 
@@ -1752,7 +1752,7 @@
 
     <string name="login_error_no_homeserver_found">Това не е валиден адрес на Matrix сървър</string>
     <string name="settings_add_3pid_confirm_password_title">Потвърдете паролата</string>
-    <string name="settings_add_3pid_flow_not_supported">Не може да направите това от мобилно приложение на Riot</string>
+    <string name="settings_add_3pid_flow_not_supported">Не може да направите това от мобилно приложение на Element</string>
     <string name="settings_add_3pid_authentication_needed">Нужна е автентикация</string>
 
 
@@ -1824,18 +1824,18 @@
 
     <string name="login_continue">Продължи</string>
     <string name="login_connect_to">Свържи се с %1$s</string>
-    <string name="login_connect_to_modular">Свърже се с Modular</string>
+    <string name="login_connect_to_modular">Свърже се с Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Свържи се със собствен сървър</string>
     <string name="login_signin_to">Влез в %1$s</string>
     <string name="login_signup">Регистрация</string>
     <string name="login_signin">Вход</string>
     <string name="login_signin_sso">Продължи със SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Modular адрес</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services адрес</string>
     <string name="login_server_url_form_other_hint">Адрес</string>
     <string name="login_server_url_form_modular_text">Премиум хостинг за организации</string>
-    <string name="login_server_url_form_modular_notice">Въведете адреса на Modular Riot или на сървър, който искате да използвате</string>
-    <string name="login_server_url_form_other_notice">Въведете адреса на сървър или Riot към който да се свържете</string>
+    <string name="login_server_url_form_modular_notice">Въведете адреса на Modular Element или на сървър, който искате да използвате</string>
+    <string name="login_server_url_form_other_notice">Въведете адреса на сървър или Element към който да се свържете</string>
 
     <string name="login_sso_error_message">Възникна грешка при зареждане на страницата: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Приложението не може да влезе в този сървър. Сървъра поддържа следните методи за вход: %1$s.
@@ -1908,7 +1908,7 @@
 \nПрекратяване на процеса на регистрация\?</string>
 
     <string name="login_a11y_choose_matrix_org">Избери matrix.org</string>
-    <string name="login_a11y_choose_modular">Избери Modular</string>
+    <string name="login_a11y_choose_modular">Избери Element Matrix Services</string>
     <string name="login_a11y_choose_other">Избери собствен сървър</string>
     <string name="login_a11y_captcha_container">Моля извършете captcha проверката</string>
     <string name="login_terms_title">Приемете условията за да продължите</string>
@@ -1954,7 +1954,7 @@
 \nВлезте отново за да достъпите профила и съобщенията си.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Ще загубите достъпа до защитените съобщения, освен ако не влезете за да възстановите ключовете за шифроване.</string>
     <string name="soft_logout_clear_data_dialog_submit">Изчисти данните</string>
-    <string name="soft_logout_sso_not_same_user_error">Текущата сесия е за потребител %1$s, а вие сте въвели данни за вход за %2$s. RiotX не поддържа това.
+    <string name="soft_logout_sso_not_same_user_error">Текущата сесия е за потребител %1$s, а вие сте въвели данни за вход за %2$s. Element не поддържа това.
 \nПърво изчистете данните, след това влезте отново с друг профил.</string>
 
     <string name="permalink_malformed">matrix.to връзката ви беше невалидна</string>
@@ -1977,7 +1977,7 @@
     <string name="autocomplete_limited_results">Показване само на първите резултати. Въведете още букви…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Бърз-провал</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX може да забива по-често когато възникне неочаквана грешка</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element може да забива по-често когато възникне неочаквана грешка</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>
 
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index bd29fd0574..787132383c 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -269,7 +269,7 @@
     <string name="e2e_re_request_encryption_key_sent">চাবির অনুরোধ পাঠানো।</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">অনুরোধ পাঠানো</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">দয়া করে শুরু করুন Riot অন্য সেশান যেটা পারে বর্ণনা করতে বার্তা কে সুতরাং এটা পারে পাঠাতে চাবিগুলো কে যন্ত্র তে.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">দয়া করে শুরু করুন Element অন্য সেশান যেটা পারে বর্ণনা করতে বার্তা কে সুতরাং এটা পারে পাঠাতে চাবিগুলো কে যন্ত্র তে.</string>
 
     <string name="read_receipts_list">পড়ো প্রাপ্তিগুলি সারি</string>
 
@@ -298,7 +298,7 @@
     <string name="room_info_room_topic">ঘরএর বিষয়</string>
 
     <string name="settings_call_category">ডাকা</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">ব্যবহার করছেন অনুপস্থিত Riot রিংটোন আগামী ডাক এর জন্য</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">ব্যবহার করছেন অনুপস্থিত Element রিংটোন আগামী ডাক এর জন্য</string>
     <string name="settings_call_ringtone_title">আসা কল এর রিংটোন</string>
     <string name="settings_call_ringtone_dialog_title">নির্বাচন করুন রিংটোন কল আর জন্য:</string>
 
@@ -322,18 +322,18 @@
     <string name="media_picker_cannot_record_video">পারছেন না দৃশ্য নথি করতে</string>
 
     <string name="permissions_rationale_popup_title">তথা</string>
-    <string name="permissions_rationale_msg_storage">Riot এর প্রয়াজন অনুমতি নিতে আপনার ছবি এবং দৃশ্য রেকর্ড কে গ্রন্থাগার থেকে পাঠিয়ে জমার জায়গায় সংযুক্ত করতে।
+    <string name="permissions_rationale_msg_storage">Element এর প্রয়াজন অনুমতি নিতে আপনার ছবি এবং দৃশ্য রেকর্ড কে গ্রন্থাগার থেকে পাঠিয়ে জমার জায়গায় সংযুক্ত করতে।
 \nদেয়া করে অনুমতি দিন প্রবেশ করতে পরের pop-up কে যেটা সক্ষম আপনার নথি কে আপনার ফোন থেকে পাঠাতে।</string>
-    <string name="permissions_rationale_msg_camera">Riot এর প্রয়োজন অনুমতি নিয়ে প্রবেশে করতে আপনার ছবি তোলার যন্ত্র থেকে ছবি নিতে এবং দৃষ্টি রেকর্ড ডাকতে।</string>
+    <string name="permissions_rationale_msg_camera">Element এর প্রয়োজন অনুমতি নিয়ে প্রবেশে করতে আপনার ছবি তোলার যন্ত্র থেকে ছবি নিতে এবং দৃষ্টি রেকর্ড ডাকতে।</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nদয়াকরে অনুমতি দিন প্রবেশ করাতে পরের পপ -আপ কে যেটা ডাকতে সক্ষম।"</string>
-    <string name="permissions_rationale_msg_record_audio">Riot এর প্রয়োজন অনুমতি নিয়ে প্রবেশ করতে আপনার মাইক্রোফোন আর মাধ্যমে শোনার কালএর সঞ্চালনা করতে।</string>
+    <string name="permissions_rationale_msg_record_audio">Element এর প্রয়োজন অনুমতি নিয়ে প্রবেশ করতে আপনার মাইক্রোফোন আর মাধ্যমে শোনার কালএর সঞ্চালনা করতে।</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nদেয়া করে অনুমতিদিন প্রবেশ করতে পরের pop-up এ যেটা কল করতে সক্ষম।"</string>
     <string name="notification_sync_init">সেবা আরম্ভ করা হচ্ছে</string>
-    <string name="permissions_rationale_msg_camera_and_audio">ভিডিও কল সম্পাদনের জন্য Riot আপনার ক্যামেরা এবং আপনার মাইক্রোফোন অ্যাক্সেস করার অনুমতির প্রয়োজন।
+    <string name="permissions_rationale_msg_camera_and_audio">ভিডিও কল সম্পাদনের জন্য Element আপনার ক্যামেরা এবং আপনার মাইক্রোফোন অ্যাক্সেস করার অনুমতির প্রয়োজন।
 \n
 \nকল করতে সক্ষম হতে পরবর্তী পপ আপ অ্যাক্সেস অনুমতি দিন।</string>
     <string name="permissions_rationale_msg_contacts">রায়ট অন্যান্য ম্যাট্রিক্স ব্যবহারকারীদের তাদের ইমেল এবং ফোন নম্বরগুলির উপর ভিত্তি করে আপনার ঠিকানা বইটি চেক করতে পারে। আপনি যদি এই উদ্দেশ্যে আপনার ঠিকানা বইটি ভাগ করে নিতে সম্মত হন তবে দয়া করে পরবর্তী পপ-আপটিতে অ্যাক্সেসের অনুমতি দিন।</string>
@@ -573,7 +573,7 @@
     <string name="settings_troubleshoot_test_device_settings_title">সেশান সেটিংস।</string>
     <string name="settings_troubleshoot_test_device_settings_success">বিজ্ঞপ্তি এই সেশানের জন্য সক্রিয় করা হয়েছে।</string>
     <string name="settings_troubleshoot_test_device_settings_failed">বিজ্ঞপ্তি এই সেশানের জন্য অনুমতি দেওয়া হয় নি। 
-\nRiot এর সেটিংস যাচাই করুন।</string>
+\nElement এর সেটিংস যাচাই করুন।</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">সক্ষম</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">কাস্টম সেটিংস।</string>
@@ -584,7 +584,7 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services পরীক্ষা</string>
     <string name="settings_troubleshoot_test_play_services_success">গুগল প্লে সার্ভিসেস APK পাওয়া গেছে এবং আপ টু ডেট রয়েছে।</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot পুশ বার্তার প্রদানের জন্য Google Play পরিষেবাদি ব্যবহার করে কিন্তু এটি সঠিকভাবে কনফিগার করা বলে মনে হচ্ছে না:
+    <string name="settings_troubleshoot_test_play_services_failed">Element পুশ বার্তার প্রদানের জন্য Google Play পরিষেবাদি ব্যবহার করে কিন্তু এটি সঠিকভাবে কনফিগার করা বলে মনে হচ্ছে না:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play Services ঠিক করুন</string>
 
@@ -594,11 +594,11 @@
     <string name="settings_troubleshoot_test_fcm_failed">FCM টোকেন উদ্ধার করতে ব্যর্থ হয়েছে:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nএই ত্রুটিটি Riot এর নিয়ন্ত্রণের বাইরে এবং Google এর মতে, এই ত্রুটিটি ইঙ্গিত করে যে ডিভাইসটিতে FCM এর সাথে নিবন্ধিত অনেকগুলি অ্যাপ্লিকেশন রয়েছে। ত্রুটিগুলি কেবলমাত্র অ্যাপ্লিকেশনের চরম সংখ্যাগুলিতে ঘটে থাকে, তাই এটি গড় ব্যবহারকারীকে প্রভাবিত করবে না।</string>
+\nএই ত্রুটিটি Element এর নিয়ন্ত্রণের বাইরে এবং Google এর মতে, এই ত্রুটিটি ইঙ্গিত করে যে ডিভাইসটিতে FCM এর সাথে নিবন্ধিত অনেকগুলি অ্যাপ্লিকেশন রয়েছে। ত্রুটিগুলি কেবলমাত্র অ্যাপ্লিকেশনের চরম সংখ্যাগুলিতে ঘটে থাকে, তাই এটি গড় ব্যবহারকারীকে প্রভাবিত করবে না।</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s] 
-\nএই ত্রুটি Riot এর নিয়ন্ত্রণের বাইরে। এটা বিভিন্ন কারণে ঘটতে পারে। আপনি পরে পুনরায় চেষ্টা করলে হয়তো এটি কাজ করবে, আপনি এটিও পরীক্ষা করতে পারেন যে Google Play পরিষেবাটি সিস্টেম সেটিংসে ডেটা ব্যবহারের ক্ষেত্রে সীমাবদ্ধ নয়, অথবা আপনার ডিভাইসের ঘড়ি সঠিক, বা এটি কাস্টম রমতে ঘটতে পারে।</string>
+\nএই ত্রুটি Element এর নিয়ন্ত্রণের বাইরে। এটা বিভিন্ন কারণে ঘটতে পারে। আপনি পরে পুনরায় চেষ্টা করলে হয়তো এটি কাজ করবে, আপনি এটিও পরীক্ষা করতে পারেন যে Google Play পরিষেবাটি সিস্টেম সেটিংসে ডেটা ব্যবহারের ক্ষেত্রে সীমাবদ্ধ নয়, অথবা আপনার ডিভাইসের ঘড়ি সঠিক, বা এটি কাস্টম রমতে ঘটতে পারে।</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nএই ত্রুটি Riot এর নিয়ন্ত্রণের বাইরে। ফোনে কোন গুগল একাউন্ট নেই। অ্যাকাউন্ট ম্যানেজার খুলুন এবং একটি গুগল একাউন্ট যোগ করুন।</string>
+\nএই ত্রুটি Element এর নিয়ন্ত্রণের বাইরে। ফোনে কোন গুগল একাউন্ট নেই। অ্যাকাউন্ট ম্যানেজার খুলুন এবং একটি গুগল একাউন্ট যোগ করুন।</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">একাউন্ট যোগ করুন</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">টোকেন নিবন্ধন</string>
@@ -618,11 +618,11 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">বুট করার সময় শুরু</string>
     <string name="settings_troubleshoot_test_service_boot_success">ডিভাইসটি পুনরায় চালু হলে পরিষেবা শুরু হবে।</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">ডিভাইসটি পুনরায় চালু হওয়ার সময় পরিষেবাটি শুরু হবে না, আপনি একবার Riot টি খোলা না হওয়া পর্যন্ত বিজ্ঞপ্তি পাবেন না।</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">ডিভাইসটি পুনরায় চালু হওয়ার সময় পরিষেবাটি শুরু হবে না, আপনি একবার Element টি খোলা না হওয়া পর্যন্ত বিজ্ঞপ্তি পাবেন না।</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">বুট থেকে শুরু করা সক্রিয় করুন</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">ব্যাকগ্রাউন্ড এর সীমাবদ্ধতা চেক করুন</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">ব্যাকগ্রউন্ডের সীমাবদ্ধতা Riot এর জন্য নিষ্ক্রিয় করা হয়েছে। এই পরীক্ষা মোবাইল ডেটা ব্যবহার করে চালানো উচিত (ওয়াইফাই না)।
+    <string name="settings_troubleshoot_test_bg_restricted_success">ব্যাকগ্রউন্ডের সীমাবদ্ধতা Element এর জন্য নিষ্ক্রিয় করা হয়েছে। এই পরীক্ষা মোবাইল ডেটা ব্যবহার করে চালানো উচিত (ওয়াইফাই না)।
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_failed">ব্যাকগ্রউন্ডের সীমাবদ্ধতা রিমোট এর জন্য সক্রিয় করা হয়েছে।
 \nঅ্যাপ্লিকেশন যেটি করার চেষ্টা করে সেটি ব্যাকগ্রাউন্ডে থাকা অবস্থায় আক্রমনাত্মকভাবে সীমিত হবে এবং এটি বিজ্ঞপ্তিগুলিতে প্রভাবিত হতে পারে।
@@ -630,7 +630,7 @@
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">সীমাবদ্ধগুলি নিষ্ক্রিয়</string>
 
     <string name="settings_troubleshoot_test_battery_title">ব্যাটারি অপ্টিমাইজেশান</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot ব্যাটারি অপ্টিমাইজেশান দ্বারা প্রভাবিত হয় না।</string>
+    <string name="settings_troubleshoot_test_battery_success">Element ব্যাটারি অপ্টিমাইজেশান দ্বারা প্রভাবিত হয় না।</string>
     <string name="settings_troubleshoot_test_battery_failed">যদি কোনও ব্যবহারকারী কোনও ডিভাইসটিকে নির্দিষ্ট সময়ের জন্য আনপ্লাগ এবং স্থিতিশীল রাখে তবে স্ক্রীন বন্ধের সাথে ডিভাইসটি ডোজ মোডে প্রবেশ করে। এটি অ্যাপ্লিকেশানগুলিকে নেটওয়ার্ক অ্যাক্সেস করতে বাধা দেয় এবং তাদের কাজ, সিঙ্ক এবং মান অ্যালার্মগুলি স্থগিত করে।</string>
     <string name="settings_troubleshoot_test_battery_quickfix">"অপ্টিমাইজেশান অবহেলা "</string>
 
@@ -764,19 +764,19 @@
     <string name="settings_deactivate_my_account">আমার একাউন্ট নিষ্ক্রিয় করুন</string>
 
     <string name="startup_notification_privacy_title">বিজ্ঞপ্তি\'র গোপনীয়তা</string>
-    <string name="startup_notification_privacy_message">সুরক্ষিতভাবে এবং ব্যক্তিগতভাবে আপনার বিজ্ঞপ্তি পরিচালনা করতে Riot পটভূমিতে চালাতে পারে। এই ব্যাটারি ব্যবহার প্রভাবিত হতে পারে।</string>
+    <string name="startup_notification_privacy_message">সুরক্ষিতভাবে এবং ব্যক্তিগতভাবে আপনার বিজ্ঞপ্তি পরিচালনা করতে Element পটভূমিতে চালাতে পারে। এই ব্যাটারি ব্যবহার প্রভাবিত হতে পারে।</string>
     <string name="startup_notification_privacy_button_grant">অনুমতি প্রদান করুন</string>
     <string name="startup_notification_privacy_button_other">অন্য বিকল্প চয়ন করুন</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">পটভূমি সংযোগ</string>
-    <string name="startup_notification_fdroid_battery_optim_message">নির্ভরযোগ্য বিজ্ঞপ্তি পেতে Riot কম প্রভাব ব্যাকগ্রাউন্ড সংযোগ রাখা প্রয়োজন।
+    <string name="startup_notification_fdroid_battery_optim_message">নির্ভরযোগ্য বিজ্ঞপ্তি পেতে Element কম প্রভাব ব্যাকগ্রাউন্ড সংযোগ রাখা প্রয়োজন।
 \nপরবর্তী স্ক্রিনে আপনাকে দাঙ্গাটি সর্বদা ব্যাকগ্রাউন্ডে চালানোর অনুমতি দেওয়া হবে, দয়া করে স্বীকার করুন।</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">অনুমতি প্রদান করুন</string>
 
     <string name="settings_analytics">বৈশ্লেষিক ন্যায়</string>
     <string name="settings_opt_in_of_analytics">বিশ্লেষণ তথ্য পাঠান</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot আমাদের অ্যাপ্লিকেশন উন্নত করার অনুমতি দেওয়ার জন্য বেনামী বিশ্লেষণ সংগ্রহ করে।</string>
-    <string name="settings_opt_in_of_analytics_prompt">আমাদের Riot উন্নত করতে সাহায্য করার জন্য বিশ্লেষণ সক্রিয় করুন।</string>
+    <string name="settings_opt_in_of_analytics_summary">Element আমাদের অ্যাপ্লিকেশন উন্নত করার অনুমতি দেওয়ার জন্য বেনামী বিশ্লেষণ সংগ্রহ করে।</string>
+    <string name="settings_opt_in_of_analytics_prompt">আমাদের Element উন্নত করতে সাহায্য করার জন্য বিশ্লেষণ সক্রিয় করুন।</string>
     <string name="settings_opt_in_of_analytics_ok">হ্যাঁ, আমি সাহায্য করতে চাই!</string>
 
     <string name="settings_data_save_mode">ডেটা সংরক্ষণ মোড</string>
diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
index e48652a9b6..168c2479ae 100644
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/vector/src/main/res/values-bs/strings.xml
@@ -85,7 +85,7 @@
     <string name="user_directory_header">Imenik korisnika</string>
     <string name="matrix_only_filter">Samo matriks kontakti</string>
     <string name="no_conversation_placeholder">Nema razgovora</string>
-    <string name="no_contact_access_placeholder">Niste omogućili Riotu pristup vašim lokalnim kontaktima</string>
+    <string name="no_contact_access_placeholder">Niste omogućili Elementu pristup vašim lokalnim kontaktima</string>
     <string name="no_result_placeholder">Nema rezultata</string>
 
     <string name="rooms_header">Sobe</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index e482b81812..3becd5213b 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -101,7 +101,7 @@
     <string name="user_directory_header">Directori de l\'usuari</string>
     <string name="matrix_only_filter">Només contactes de Matrix</string>
     <string name="no_conversation_placeholder">Cap conversa</string>
-    <string name="no_contact_access_placeholder">No vau donar permís al Riot per accedir als contactes locals</string>
+    <string name="no_contact_access_placeholder">No vau donar permís al Element per accedir als contactes locals</string>
     <string name="no_result_placeholder">Cap resultat</string>
 
     <!-- Rooms fragment -->
@@ -274,16 +274,16 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informació</string>
-    <string name="permissions_rationale_msg_storage">Per poder enviar i desar adjunts, el Riot necessita permís d\'accés a la galeria de fotos i vídeos.\n\nA la següent finestra emergent, doneu-li el permís d\'accés i així podreu enviar fitxers des del telefon.</string>
-    <string name="permissions_rationale_msg_camera">Per poder fer fotos i vídeotrucades, el Riot necessita permís d\'accés a la càmera.</string>
+    <string name="permissions_rationale_msg_storage">Per poder enviar i desar adjunts, el Element necessita permís d\'accés a la galeria de fotos i vídeos.\n\nA la següent finestra emergent, doneu-li el permís d\'accés i així podreu enviar fitxers des del telefon.</string>
+    <string name="permissions_rationale_msg_camera">Per poder fer fotos i vídeotrucades, el Element necessita permís d\'accés a la càmera.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nA la següent finestra emergent, doneu permís d\'accés per tal de poder fer la trucada.</string>
-    <string name="permissions_rationale_msg_record_audio">Per tal de fer trucades de veu, el Riot necessita permís d\'accés al microfon.</string>
+    <string name="permissions_rationale_msg_record_audio">Per tal de fer trucades de veu, el Element necessita permís d\'accés al microfon.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nA la següent finestra emergent, doneu permís d\'accés per tal de poder fer la trucada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Per tal de fer vídeotrucades, el Riot necessita permís d\'accés a la càmera i al microfon.\n\nA la següent finestra emergent, doneu permís d\'accés per tal de poder fer la trucada.</string>
-    <string name="permissions_rationale_msg_contacts">Riot pot comprovar la vostra agenda de contactes per tal de trobar altres usuaris de Matrix basant-se en les seves adreces de correu i números de telèfon.
+    <string name="permissions_rationale_msg_camera_and_audio">Per tal de fer vídeotrucades, el Element necessita permís d\'accés a la càmera i al microfon.\n\nA la següent finestra emergent, doneu permís d\'accés per tal de poder fer la trucada.</string>
+    <string name="permissions_rationale_msg_contacts">Element pot comprovar la vostra agenda de contactes per tal de trobar altres usuaris de Matrix basant-se en les seves adreces de correu i números de telèfon.
 \n
 \nSi accepteu compartir la vostra agenda de contactes amb aquesta finalitat, si us plau permeteu l\'accés de la següent finestra emergent.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Per tal de trobar altres usuaris de Matrix a partir dels seus correus electrònics o dels seus números de telefon, el Riot necessita permís d\'accés a l\'agenda de contactes.\n\nPermeteu que Riot accedeixi als vostres contactes?</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Per tal de trobar altres usuaris de Matrix a partir dels seus correus electrònics o dels seus números de telefon, el Element necessita permís d\'accés a l\'agenda de contactes.\n\nPermeteu que Element accedeixi als vostres contactes?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">No s\'ha realitzat l\'acció per falta de permisos</string>
 
@@ -708,7 +708,7 @@ Atenció: es podria eliminar aquest fitxer si es desinstal·la l\'aplicació.</s
     <string name="encryption_information_verify_device_warning2">Si coincideix, premeu el botó per verificar. Si no coincideix, algú està interceptant aquest dispositiu i probablement voldreu prémer el botó per bloquejar-lo. En un futur aquest procés de verificació serà més sofisticat.</string>
     <string name="encryption_information_verify_key_match">Verifica que les claus coincideixen</string>
 
-    <string name="e2e_enabling_on_app_update">El Riot ara permet l\'ús d\'encriptació d\'extrem a extrem però us heu de tronar a connectar per tal d\'activar-la.\n\nHo podeu fer ara o més tard des de les preferències de l\'aplicació.</string>
+    <string name="e2e_enabling_on_app_update">El Element ara permet l\'ús d\'encriptació d\'extrem a extrem però us heu de tronar a connectar per tal d\'activar-la.\n\nHo podeu fer ara o més tard des de les preferències de l\'aplicació.</string>
 
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La sala conté dispositius desconeguts</string>
@@ -883,7 +883,7 @@ Atenció: es podria eliminar aquest fitxer si es desinstal·la l\'aplicació.</s
     <string name="e2e_re_request_encryption_key_sent">Petició de clau enviada.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Sol·licitud enviada</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Si us plau, engega Riot a un altre dispositiu que pugui desencriptar el missatge de manera que pugui enviar la clau a aquest dispositiu.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Si us plau, engega Element a un altre dispositiu que pugui desencriptar el missatge de manera que pugui enviar la clau a aquest dispositiu.</string>
 
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="status_theme">Tema Status.im</string>
@@ -944,13 +944,13 @@ En voleu afegir algun?</string>
     <string name="settings_deactivate_my_account">Desactivar el meu compte</string>
 
     <string name="startup_notification_privacy_title">Notificació de privacitat</string>
-    <string name="startup_notification_privacy_message">El Riot pot funcionar en segon pla per gestionar les vostres notificacions de forma segura i privada. Això podria afectar el consum de bateria.</string>
+    <string name="startup_notification_privacy_message">El Element pot funcionar en segon pla per gestionar les vostres notificacions de forma segura i privada. Això podria afectar el consum de bateria.</string>
     <string name="startup_notification_privacy_button_grant">Concedir permís</string>
     <string name="startup_notification_privacy_button_other">Escolliu una altra opció</string>
 
     <string name="settings_opt_in_of_analytics">Envia dades d\'anàlisi</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot recopila dades d\'anàlisi anònimes per tal de permetre\'ns millorar l\'aplicació.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Si us plau, activeu les dades d\'anàlisi per ajudar-nos a millorar Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element recopila dades d\'anàlisi anònimes per tal de permetre\'ns millorar l\'aplicació.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Si us plau, activeu les dades d\'anàlisi per ajudar-nos a millorar Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Sí, vull ajudar!</string>
 
     <string name="settings_without_flair">No sou ara mateix membre de cap comunitat.</string>
@@ -1035,7 +1035,7 @@ En voleu afegir algun?</string>
     <string name="accept">Acceptar</string>
 
     <string name="settings_call_category">Trucada</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Useu el to de Riot per defecte per les trucades entrants</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Useu el to de Element per defecte per les trucades entrants</string>
     <string name="settings_call_ringtone_title">To de trucada entrant</string>
     <string name="settings_call_ringtone_dialog_title">Escolliu el to per les trucades:</string>
 
@@ -1086,12 +1086,12 @@ Proveu de reiniciar l\'aplicació.</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Inhabilita les restriccions</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimització de bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">El Riot no està afectat per l\'optimització de bateria.</string>
+    <string name="settings_troubleshoot_test_battery_success">El Element no està afectat per l\'optimització de bateria.</string>
     <string name="settings_show_join_leave_messages">Mostra els esdeveniments d\'entrada i sortida</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Inclou els canvis d\'avatar i àlies.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Connexió al rerefons</string>
-    <string name="startup_notification_fdroid_battery_optim_message">El Riot necessita mantenir una connexió de baix impacte al rerefons, per tal de tindre notificacions fiables.
-A la pantalla següent se us demanarà que permeteu al Riot executar-se sempre al rerefons, si us plau, accepteu-ho.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">El Element necessita mantenir una connexió de baix impacte al rerefons, per tal de tindre notificacions fiables.
+A la pantalla següent se us demanarà que permeteu al Element executar-se sempre al rerefons, si us plau, accepteu-ho.</string>
     <string name="settings_password">Contrasenya</string>
     <string name="account_additional_info">Informació addicional: %s</string>
 
@@ -1113,8 +1113,8 @@ A la pantalla següent se us demanarà que permeteu al Riot executar-se sempre a
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">No s\'ha trobat cap APK de Google Play Services vàlid. Les notificacions poden no funcionar correctament.</string>
 
-    <string name="store_title">Riot.im - Comunica\'t, a la teva manera</string>
-    <string name="store_whats_new">"Sempre hi som fent canvis i millores al Riot.im.
+    <string name="store_title">Element - Comunica\'t, a la teva manera</string>
+    <string name="store_whats_new">"Sempre hi som fent canvis i millores al Element.
 Podeu trobar el registre de canvis complet aquí: %1$s.
 Per assegurar-vos que no us perdeu res, només heu de mantenir les actualitzacions automàtiques habilitades."</string>
     <string name="store_short_description">Una aplicació de xat universal i segura sota el vostre control.</string>
@@ -1133,7 +1133,7 @@ Per assegurar-vos que no us perdeu res, només heu de mantenir les actualitzacio
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Ha fallat una o més proves, envieu un informe d\'error per ajudar-nos a investigar-ho.</string>
 
     <string name="settings_troubleshoot_test_device_settings_failed">Les notificacions no són permeses per a aquest dispositiu.
-Comproveu els paràmetres del Riot.</string>
+Comproveu els paràmetres del Element.</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Paràmetres personalitzats.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Teniu en compte que alguns tipus de missatge estan configurats per a ser silenciosos (això produirà una notificació sense so).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Algunes notificacions estan inhabilitades als vostres paràmetres personalitzats.</string>
@@ -1142,7 +1142,7 @@ Comproveu els paràmetres del Riot.</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Comprovació dels serveis de Play</string>
     <string name="settings_troubleshoot_test_play_services_success">L\'APK dels serveis de Google Play és disponible i al dia.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">El Riot empra els serveis de Google Play per a lliurar les notificacions, però no sembla que estiguen configurats correctament.
+    <string name="settings_troubleshoot_test_play_services_failed">El Element empra els serveis de Google Play per a lliurar les notificacions, però no sembla que estiguen configurats correctament.
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">Testimoni del Firebase</string>
     <string name="settings_troubleshoot_test_fcm_success">S\'ha recuperat el testimoni FCM correctament.
@@ -1150,7 +1150,7 @@ Comproveu els paràmetres del Riot.</string>
     <string name="settings_troubleshoot_test_fcm_failed">No s\'ha pogut recuperar el testimonu FCM:
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Aquest error és fora del control del Riot i segons Google aquest error indica que aquest dispositiu té massa aplicacions registrades amb FCM. L\'error només ocorre en casos en què hi ha un nombre extrem d\'aplicacions, i no hauria d\'afectar un usuari normal.</string>
+Aquest error és fora del control del Element i segons Google aquest error indica que aquest dispositiu té massa aplicacions registrades amb FCM. L\'error només ocorre en casos en què hi ha un nombre extrem d\'aplicacions, i no hauria d\'afectar un usuari normal.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Afegeix un compte</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Registre del testimoni</string>
@@ -1163,7 +1163,7 @@ Aquest error és fora del control del Riot i segons Google aquest error indica q
     <string name="settings_troubleshoot_test_service_restart_failed">No s\'ha pogut iniciar el servei</string>
 
     <string name="settings_troubleshoot_test_service_boot_success">El servei s\'iniciarà quan s\'iniciï el dispositiu.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">El servei no s\'iniciarà quan el dispositiu s\'iniciï, per la qual cosa no rebreu notificacions fins que el Riot s\'haja obert una vegada.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">El servei no s\'iniciarà quan el dispositiu s\'iniciï, per la qual cosa no rebreu notificacions fins que el Element s\'haja obert una vegada.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Habilita l\'inici durant l\'arrencada</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Comprova les restriccions del rerefons</string>
@@ -1193,7 +1193,7 @@ Aquest error és fora del control del Riot i segons Google aquest error indica q
     <string name="passphrase_empty_error_message">Introduïu una frase de pas</string>
     <string name="passphrase_passphrase_too_weak">La frase de pas és massa feble</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Suprimiu la frase de pas si voleu que el Riot generi una clau de recuperació.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Suprimiu la frase de pas si voleu que el Element generi una clau de recuperació.</string>
     <string name="keys_backup_no_session_error">No hi ha cap sessió de Matrix disponible</string>
 
     <string name="keys_backup_setup_step1_title">No perdeu mai els missatges xifrats</string>
@@ -1228,24 +1228,24 @@ Avís: és possible que calgui suprimir el fitxer si es desinstal·la l\'aplicac
 
     <string name="keys_backup_restore_with_key_helper">Heu perdut la vostra clau de recuperació? Podeu establir una nova a les preferències.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">"[%1$s]
-Aquest error és fora del control del Riot. Pot ocórrer per diferents raons. És possible que funcioni si ho torneu a provar més endavant. També podeu comprovar que el servei de Google Play no està restringit a l\'ús  de dades a les preferències del sistema, o que el rellotge del dispositiu marca l\'hora correcta. També pot passar amb ROM personalitzades."</string>
+Aquest error és fora del control del Element. Pot ocórrer per diferents raons. És possible que funcioni si ho torneu a provar més endavant. També podeu comprovar que el servei de Google Play no està restringit a l\'ús  de dades a les preferències del sistema, o que el rellotge del dispositiu marca l\'hora correcta. També pot passar amb ROM personalitzades."</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Aquest error és fora del control del Riot. No hi ha cap compte de Google al telèfon. Obrir el gestor de comptes i afegiu un compte de Google.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Les restriccions de rerefons són inhabilitades per al Riot. Aquesta prova s\'hauria d\'executar emprant dades mòbils (sense wifi).
+Aquest error és fora del control del Element. No hi ha cap compte de Google al telèfon. Obrir el gestor de comptes i afegiu un compte de Google.</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Les restriccions de rerefons són inhabilitades per al Element. Aquesta prova s\'hauria d\'executar emprant dades mòbils (sense wifi).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Les restriccions de rerefons són habilitades per al Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Les restriccions de rerefons són habilitades per al Element.
 Les tasques que l\'aplicació intenta fer estaran restringides agressivament mentre estigui al rerefons, i això pot afectar les notificacions.
 %1$s</string>
     <string name="settings_troubleshoot_test_battery_failed">Si un usuari deixa un dispositiu sense endollar i immòbil durant un període de temps, amb la pantalla apagada, el dispositiu entra en el mode d\'estalvi d\'energia. Això impedeix les aplicacions d\'accedir a la xarxa i ajorna les seves tasques, sincronitzacions i alarmes estàndard.</string>
-    <string name="store_full_description">"Una aplicació de xat, sota el vostre control i totalment flexible. El Riot us permet comunicar-vos de la manera que preferiu. Fet per al [matrix] - l’estàndard per a la comunicació oberta i descentralitzada.
+    <string name="store_full_description">"Una aplicació de xat, sota el vostre control i totalment flexible. El Element us permet comunicar-vos de la manera que preferiu. Fet per al [matrix] - l’estàndard per a la comunicació oberta i descentralitzada.
 
 Obteniu un compte gratuït de matrix.org, executeu el vostre servidor propi a https://modular.im, o empreu un altre servidor de Matrix.
 
-Per què triar Riot.im?
+Per què triar Element?
 
 • COMUNICACIÓ COMPLETA: Creeu sales al voltant dels vostres equips, els vostre amics o la vostra comunitat - de la manera que preferiu! Converseu, compartiu fitxers, afegiu ginys i feu trucades de veu i vídeo - tot de manera gratuïta.
 
-• INTEGRACIONS POTENTS: Empreu el Riot.im amb les eines que ja coneixeu i us agraden. Amb el Riot.im fins i tot podeu conversar amb usuaris i grups d’altres aplicacions de xat.
+• INTEGRACIONS POTENTS: Empreu el Element amb les eines que ja coneixeu i us agraden. Amb el Element fins i tot podeu conversar amb usuaris i grups d’altres aplicacions de xat.
 
 • PRIVAT I SEGUR: Mantingueu les vostres converses en secret. Xifratge punt a punt us assegura que les comunicacions privades continuaran sent privades.
 
@@ -1442,7 +1442,7 @@ Per què triar Riot.im?
 
     <string name="keys_backup_settings_checking_backup_state">Comprovant l\'estat de la còpia de seguretat</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opcions d\'autocompleció del servidor</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot ha detectat una configuració de servidor personalitzat pel domini del seu identificador d\'usuari \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element ha detectat una configuració de servidor personalitzat pel domini del seu identificador d\'usuari \"%1$s\":
 \n%2$s</string>
     <string name="invalid_or_expired_credentials">Us heu desconnectat a causa de credencials incorrectes o caducades.</string>
 
@@ -1530,7 +1530,7 @@ Per què triar Riot.im?
     <string name="group_all_communities">Totes les comunitats</string>
 
     <string name="room_preview_no_preview">Aquesta sala no es pot pre-visualitzar</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">RiotX encara no suporta la pre-visualització de sales llegibles per tothom</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Element encara no suporta la pre-visualització de sales llegibles per tothom</string>
 
     <string name="fab_menu_create_room">Sales</string>
     <string name="fab_menu_create_chat">Missatges directes</string>
@@ -1547,7 +1547,7 @@ Per què triar Riot.im?
     <string name="keys_backup_unable_to_get_keys_backup_data">Hi ha hagut un error rebent dades de la còpia de seguretat de les claus</string>
 
     <string name="alpha_disclaimer_title">Benvinguts a la beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Mentre RiotX estigui en les primeres etapes de desenvolupament, faltaran algunes funcions i podríeu experimentar alguns errors.</string>
+    <string name="alpha_disclaimer_content_line_1">Mentre Element estigui en les primeres etapes de desenvolupament, faltaran algunes funcions i podríeu experimentar alguns errors.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">L\'última llista de característiques està sempre a %1$s, i si trobeu errors si us plau reporteu informe des de la part superior esquerra del menú d\'Inici, i el resoldrem tan aviat com puguem.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Descripció de la Play Store</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Si trobeu errors si us plau envieu un informe d\'errors des de la part superior esquerra del menú d\'Inici, i el resoldrem tan aviat com puguem.</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 2517faa07b..f082a68fa8 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -94,7 +94,7 @@
     <string name="user_directory_header">Uživatelský adresář</string>
     <string name="matrix_only_filter">Pouze kontakty Matrix</string>
     <string name="no_conversation_placeholder">Žádné konverzace</string>
-    <string name="no_contact_access_placeholder">Nepovolil jste přístup aplikaci Riot k místním kontaktům</string>
+    <string name="no_contact_access_placeholder">Nepovolil jste přístup aplikaci Element k místním kontaktům</string>
     <string name="no_result_placeholder">Žádné výsledky</string>
 
     <string name="rooms_header">Místnosti</string>
@@ -280,7 +280,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="room_info_room_topic">Téma místnosti</string>
 
     <string name="settings_call_category">Volání</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Použít původní vyzvánění Riot pro příchozí hovory</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Použít původní vyzvánění Element pro příchozí hovory</string>
     <string name="settings_call_ringtone_title">Vyzvánění příchozího hovoru</string>
     <string name="settings_call_ringtone_dialog_title">Vybrat vyzvánění pro hovory:</string>
 
@@ -303,14 +303,14 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="media_picker_cannot_record_video">Nemohu natáčet video</string>
 
     <string name="permissions_rationale_popup_title">Informace</string>
-    <string name="permissions_rationale_msg_storage">Riot potřebuje oprávnění pro přístup do Vaší knihovny fotografií a videí, aby mohl odesílat a ukládat přílohy.
+    <string name="permissions_rationale_msg_storage">Element potřebuje oprávnění pro přístup do Vaší knihovny fotografií a videí, aby mohl odesílat a ukládat přílohy.
 \n
 \nProsím, povolte přístup na následující hlášce pro možnost odesílání souborů z Vašeho telefonu.</string>
-    <string name="permissions_rationale_msg_camera">Riot potřebuje oprávnění pro přístup k Vašemu fotoaparátu pro pořizování fotografií a uskutečňování video hovorů.</string>
+    <string name="permissions_rationale_msg_camera">Element potřebuje oprávnění pro přístup k Vašemu fotoaparátu pro pořizování fotografií a uskutečňování video hovorů.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nProsím, povolte přístup na následující hlášce, abyste mohli uskutečnit hovor."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot potřebuje oprávnění pro přístup k Vašemu mikrofonu pro uskutečňování hlasových hovorů.</string>
+    <string name="permissions_rationale_msg_record_audio">Element potřebuje oprávnění pro přístup k Vašemu mikrofonu pro uskutečňování hlasových hovorů.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nProsím, povolte přístup na následující hlášce, abyste mohli uskutečnit hovor."</string>
@@ -325,7 +325,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="preview">Náhled</string>
     <string name="room_preview_invitation_format">Byli jste pozváni %s ke vstupu do místnosti</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Žádost odeslána</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Prosím, spusťte Riot na jiném zařízení, které může dešifrovat zprávu, aby poslalo klíče této relaci.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Prosím, spusťte Element na jiném zařízení, které může dešifrovat zprávu, aby poslalo klíče této relaci.</string>
 
     <string name="read_receipts_list">Seznam doručenek</string>
 
@@ -486,11 +486,11 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="action_sign_out_confirmation_simple">Opravdu se chcete odhlásit\?</string>
     <string name="video_call_in_progress">Probíhá video hovor…</string>
 
-    <string name="permissions_rationale_msg_camera_and_audio">Riot potřebuje oprávnění pro přístup k Vaší kameře a mikrofonu pro uskutečnění video hovoru.
+    <string name="permissions_rationale_msg_camera_and_audio">Element potřebuje oprávnění pro přístup k Vaší kameře a mikrofonu pro uskutečnění video hovoru.
 \n
 \nProsím, povolte přístup na následující hlášce abyste mohli uskutečnit hovor.</string>
-    <string name="permissions_rationale_msg_contacts">Riot může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla. Pokud souhlasíte se sdílením svého adresáře za tímto účelem, prosím, povolte přístup v příští hlášce.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla. 
+    <string name="permissions_rationale_msg_contacts">Element může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla. Pokud souhlasíte se sdílením svého adresáře za tímto účelem, prosím, povolte přístup v příští hlášce.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla.
 \n 
 \nSouhlasíte se sdílením svého adresáře za tímto účelem\?</string>
 
@@ -621,7 +621,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Použiiji %s jako nápomoc, pokud Váš homeserver žádnou nenabízí (Vaše IP adresa bude sdělena během hovoru)</string>
     <string name="invite_no_identity_server_error">K provedení této akce přidat ověřovací server v nastavení.</string>
     <string name="settings_add_3pid_confirm_password_title">Potvrďte své heslo</string>
-    <string name="settings_add_3pid_flow_not_supported">Nelze provést z Riot mobile</string>
+    <string name="settings_add_3pid_flow_not_supported">Nelze provést z Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">Ověření se vyžaduje</string>
 
 
@@ -649,7 +649,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Nastavení relací.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Oznámení jsou zapnuta pro tuto relaci.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Oznámení nejsou zapnuta pro tuto relaci. 
-\nProsím, prověřte nastavení Riotu.</string>
+\nProsím, prověřte nastavení Elementu.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Zapnout</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Vlastní nastavení.</string>
@@ -660,7 +660,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Kontrola služeb Play</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK je k dispozici a aktuální.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot používá Google Play Services pro doručení zpráv push, ale patrně nejsou správně nastaveny:
+    <string name="settings_troubleshoot_test_play_services_failed">Element používá Google Play Services pro doručení zpráv push, ale patrně nejsou správně nastaveny:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Opravit Play Services</string>
 
@@ -670,11 +670,11 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_troubleshoot_test_fcm_failed">Načtení FCM tokenu selhalo:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nTato chyba je mimo kontrolu Riotu a podle Googlu indikuje, že zařízení má příliš mnoho aplikací registrovaných s FCM. Tato chyba se ukáže jen v případech extrémního množství aplikací, a proto by neměla mít vliv na normálního uživatele.</string>
+\nTato chyba je mimo kontrolu Elementu a podle Googlu indikuje, že zařízení má příliš mnoho aplikací registrovaných s FCM. Tato chyba se ukáže jen v případech extrémního množství aplikací, a proto by neměla mít vliv na normálního uživatele.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nTato chyba je mimo kontrolu Riotu. Múže k ní dojít z několika důvodů. Snad bude fungovat, když zkusíte znovu později, můžete též zkontrolovat, zda Google Play Service nejsou omezeny v množství dat v systémových nastavení nebo zda hodiny zařízení jdou správné nebo k chybě může dojít na zvláštní ROM.</string>
+\nTato chyba je mimo kontrolu Elementu. Múže k ní dojít z několika důvodů. Snad bude fungovat, když zkusíte znovu později, můžete též zkontrolovat, zda Google Play Service nejsou omezeny v množství dat v systémových nastavení nebo zda hodiny zařízení jdou správné nebo k chybě může dojít na zvláštní ROM.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nTato chyba je mimo kontrolu Riotu. V telefonu není žádný účet Google. Prosím, spusťte správce účtů a doplňte účet Google.</string>
+\nTato chyba je mimo kontrolu Elementu. V telefonu není žádný účet Google. Prosím, spusťte správce účtů a doplňte účet Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Přidat účet</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Registrace tokenu</string>
@@ -694,19 +694,19 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Spustit při zavádění</string>
     <string name="settings_troubleshoot_test_service_boot_success">Služba se spustí při restartu zařízení.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Služba se nespustí při startu zařízení, neobdržíte oznámení, dokud jednou neotevřete Riot.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Služba se nespustí při startu zařízení, neobdržíte oznámení, dokud jednou neotevřete Element.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Zapnout Spustit při zavádění</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Zkontrolovat omezení na pozadí</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Omezení na pozadí jsou pro Riot vypnuta. Tento test by měl běžet s mobilními daty (ne WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Omezení na pozadí jsou pro Element vypnuta. Tento test by měl běžet s mobilními daty (ne WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Omezení na pozadí jsou pro Riot zapnuta.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Omezení na pozadí jsou pro Element zapnuta.
 \nČinnosti prováděné aplikací budou agresivně omezeny, bude-li v pozadí, a to může mít vliv na oznámení.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Vypnout omezení</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimalizace baterie</string>
-    <string name="settings_troubleshoot_test_battery_success">Optimalizace baterie nemá na Riot vliv.</string>
+    <string name="settings_troubleshoot_test_battery_success">Optimalizace baterie nemá na Element vliv.</string>
     <string name="settings_troubleshoot_test_battery_failed">Nechá-li uživatel zařízení vytažený ze zásuvky a v klidu po nějakou dobu a s obrazovkou vypnutou, zařízení vstoupí do stavu spánku. Ten zamezí aplikacím přístup k síti a odloží jejich úlohy, synchronizaci a běžná upozornění.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorovat optimalizaci</string>
 
@@ -741,11 +741,11 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_background_sync">Synchronizace na pozadí</string>
     <string name="settings_background_fdroid_sync_mode">Režim synchronizace na pozadí (experimentální)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimalizován pro baterii</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot bude synchronizovat na pozadí způsobem, který šetří omezené zdroje zařízení (baterii).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element bude synchronizovat na pozadí způsobem, který šetří omezené zdroje zařízení (baterii).
 \nV závislosti na stavu zdrojů zařízení může být sync operačním systémem odložen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimalizováno pro reálný čas</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot bude synchronizovat na pozadí periodicky v přesný čas (nastavitelné).
-\nTo bude mít vliv na využití rádia a baterie, stálé oznámení o tom, že Riot čeká na události, bude zobrazeno.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element bude synchronizovat na pozadí periodicky v přesný čas (nastavitelné).
+\nTo bude mít vliv na využití rádia a baterie, stálé oznámení o tom, že Element čeká na události, bude zobrazeno.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Žádný sync na pozadí</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Neobdržíte oznámení o příchozích zprávách, je-li aplikace na pozadí.</string>
     <string name="settings_background_sync_update_error">Aktualizace nastavení se nezdařila.</string>
@@ -813,19 +813,19 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_discovery_category">Odhalení</string>
     <string name="settings_discovery_manage">Správa Vašich nastaveni pro odhalení.</string>
     <string name="startup_notification_privacy_title">Soukromí ohledně oznámení</string>
-    <string name="startup_notification_privacy_message">Riot může běžet na pozadí, aby spravoval Vaše oznámení bezpečně a v soukromí. To může mít vliv na baterii.</string>
+    <string name="startup_notification_privacy_message">Element může běžet na pozadí, aby spravoval Vaše oznámení bezpečně a v soukromí. To může mít vliv na baterii.</string>
     <string name="startup_notification_privacy_button_grant">Udělit svolení</string>
     <string name="startup_notification_privacy_button_other">Vybrat jinou volbu</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Spojení na pozadí</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot potřebuje udržovat spojení na pozadí se slabým vlivem, abyste obdrželi spolehlivá oznámení.
-\nNa příští obrazovce budete dotázáni o svolení nechat Riot vždy v chodu na pozadí, prosím, souhlaste.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element potřebuje udržovat spojení na pozadí se slabým vlivem, abyste obdrželi spolehlivá oznámení.
+\nNa příští obrazovce budete dotázáni o svolení nechat Element vždy v chodu na pozadí, prosím, souhlaste.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Udělit svolení</string>
 
     <string name="settings_analytics">Analýza</string>
     <string name="settings_opt_in_of_analytics">Odeslat analytická data</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot sbírá anonymní analytická data pro vylepšení aplikace.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Prosím, zapněte analýzu pro vylepšení Riotu.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element sbírá anonymní analytická data pro vylepšení aplikace.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Prosím, zapněte analýzu pro vylepšení Elementu.</string>
     <string name="settings_opt_in_of_analytics_ok">Ano, chci pomoci!</string>
 
     <string name="settings_data_save_mode">Režim úsporných dat</string>
@@ -1078,7 +1078,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="encryption_information_verify_device_warning">Potvrďte porovnáním následujícího s nastavením uživatele ve svých dalších relacích:</string>
     <string name="encryption_information_verify_device_warning2">Pokud se neshodují, zabezpečení Vaší komunikace může být ohroženo.</string>
-    <string name="e2e_enabling_on_app_update">Riot nyní podporuje šifrování end-to-end, ale pro aktivaci se musíte se opět přihlásit.
+    <string name="e2e_enabling_on_app_update">Element nyní podporuje šifrování end-to-end, ale pro aktivaci se musíte se opět přihlásit.
 \n
 \nMůžete to provést nyní nebo později z aplikačních nastavení.</string>
 
@@ -1329,18 +1329,18 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Žádný platný APK Google Plaz Services nenalezen. Oznámení možná nebudou pracovat spolehlivě.</string>
 
-    <string name="store_title">Riot.im - Komunikujte, svým způsobem</string>
-    <string name="store_whats_new">Stále měníme a vylepšujeme Riot.im. Úplný seznam změn je k nalezení zde: %1$s. Abyste zajistili, že nic nezmeškáte, ponechte aktualizace zapnuté.</string>
+    <string name="store_title">Element - Komunikujte, svým způsobem</string>
+    <string name="store_whats_new">Stále měníme a vylepšujeme Element. Úplný seznam změn je k nalezení zde: %1$s. Abyste zajistili, že nic nezmeškáte, ponechte aktualizace zapnuté.</string>
     <string name="store_short_description">Univerzální zabezpečená chat aplikace zcela pod Vaší kontrolou.</string>
-    <string name="store_full_description">Chat aplikace pod Vaší kontrolou a zcela flexibilní. Riot Vás nechá komunikovat způsobem, kterým chcete. Vytvořena pro [matrix] - standard otevřené, decentralizované komunikace.
+    <string name="store_full_description">Chat aplikace pod Vaší kontrolou a zcela flexibilní. Element Vás nechá komunikovat způsobem, kterým chcete. Vytvořena pro [matrix] - standard otevřené, decentralizované komunikace.
 \n
 \nZaložte si bezplatný účet u matrix.org, založte si svůj server na https://modular.im nebo použijte jiný Matrix server.
 \n
-\nProč zvolit Riot.im\?
+\nProč zvolit Element\?
 \n
 \n• KOMPLETNÍ KOMUNIKACE: Zakládejte místnosti pro své týmy, přátele, komunitu - jakkoli chcete! Chatujte, sdílejte soubory, přidávejte widgety, komunikujte hovorem či video hovorem - vše bezplatně.
 \n
-\n• HLUBOKÉ INTEGRACE: Používejte Riot.im s nástroji, jež znáte a máte rádi. S Riot.im můžete dokonce chatovat s uživateli a skupinami s jinými chat aplikacemi.
+\n• HLUBOKÉ INTEGRACE: Používejte Element s nástroji, jež znáte a máte rádi. S Element můžete dokonce chatovat s uživateli a skupinami s jinými chat aplikacemi.
 \n
 \n• SOUKROMÁ A ZABEZBEČENÁ: Udržujte své konverzace tajné. Nejmodernější end-to-end šifrování zaručí, že soukromé konverzace soukromými zůstanou. 
 \n
@@ -1355,7 +1355,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="passphrase_empty_error_message">Prosím, zadejte heslo</string>
     <string name="passphrase_passphrase_too_weak">Heslo je příliš slabé</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Prosím, smažte heslo, přejete-lis si, aby Riot generoval klíč pro obnovu.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Prosím, smažte heslo, přejete-lis si, aby Element generoval klíč pro obnovu.</string>
     <string name="keys_backup_no_session_error">Žádná relace Matrix není dostupná</string>
 
     <string name="keys_backup_setup_step1_title">Nikdy neztraťte šifrované zprávy</string>
@@ -1466,7 +1466,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="autodiscover_invalid_response">Neplatná odpověď z hledání homeserverů</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Volby serveru automaticky</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">"Riot nalezl vlastní konfiguraci serveru pro doménu Vašeho uživatelského Id  \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">"Element nalezl vlastní konfiguraci serveru pro doménu Vašeho uživatelského Id  \"%1$s\":
 \n%2$s"</string>
     <string name="autodiscover_well_known_autofill_confirm">Použít konfiguraci</string>
 
@@ -1520,7 +1520,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="identity_server_not_defined">Nepoužíváte žádný server pro identity</string>
     <string name="identity_server_not_defined_for_password_reset">Není konfigurován žádný server pro identity, musíte přenastavit heslo.</string>
 
-    <string name="security_warning_identity_server">Předchozí verze Riotu měly bezpečnostní chybu, jež umožnila serveru pro identity (%1$s) přístup k Vašemu účtu. Pokud důvěřujete %2$s, můžete ignorovat; jinak se, prosím, odhlašte a znovu přihlašte.
+    <string name="security_warning_identity_server">Předchozí verze Elementu měly bezpečnostní chybu, jež umožnila serveru pro identity (%1$s) přístup k Vašemu účtu. Pokud důvěřujete %2$s, můžete ignorovat; jinak se, prosím, odhlašte a znovu přihlašte.
 \n
 \nDetaily zde:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1565,7 +1565,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="group_all_communities">Všechny komunity</string>
 
     <string name="room_preview_no_preview">Nelze provést náhled této místnosti</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Náhled místnosti čitelné pro všechny zatím RiotX nepodporuje</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Náhled místnosti čitelné pro všechny zatím Element nepodporuje</string>
 
     <string name="fab_menu_create_room">Místnosti</string>
     <string name="fab_menu_create_chat">Přímé zprávy</string>
@@ -1582,7 +1582,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Při načítání dat zálohy klíčů došlo k chybě</string>
 
     <string name="alpha_disclaimer_title">Vítejte v betě!</string>
-    <string name="alpha_disclaimer_content_line_1">Protože RiotX je v raném vývoji, některé funkce mohou chybět a mohou se objevit i chyby.</string>
+    <string name="alpha_disclaimer_content_line_1">Protože Element je v raném vývoji, některé funkce mohou chybět a mohou se objevit i chyby.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">Seznam nejnovějších funkcí je vždy na %1$s a pokud nejdete chyby, prosím, zapište hlášení v levém horním menu na domovské obrazovce. Opravíme je tak brzy, jak jen můžeme.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Popis v Play Store</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Pokud nejdete chyby, prosím, zapište hlášení v levém horním menu na domovské obrazovce. Opravíme je tak brzy, jak jen můžeme.</string>
@@ -1622,15 +1622,15 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Ukázat skryté události v časovém sledu</string>
 
-    <string name="store_riotx_title">RiotX - Klient Matrixu pro příští generaci</string>
+    <string name="store_riotx_title">Element - Klient Matrixu pro příští generaci</string>
     <string name="store_riotx_short_description">Rychlejši a lehčí klient Matrixu s nejnovějšími konstrukcemi Androidu</string>
-    <string name="store_riotx_full_description">"RiotX je nový klient protokolu Matrix (Matrix.org): otevřená síť pro bezpečnou, decentralizovanou komunikaci. RiotX je úplný přepis klienta Riot Android založený na úplném přepisu Matrix Android SDK.
+    <string name="store_riotx_full_description">"Element je nový klient protokolu Matrix (Matrix.org): otevřená síť pro bezpečnou, decentralizovanou komunikaci. Element je úplný přepis klienta Riot Android založený na úplném přepisu Matrix Android SDK.
 \n
-\nProhlášení: Toto je beta verze. RiotX nyní prochází aktivním vývojem, obsahuje omezení a (doufáme, že ne moc) chyby. Veškerý feedback je vítán.
+\nProhlášení: Toto je beta verze. Element nyní prochází aktivním vývojem, obsahuje omezení a (doufáme, že ne moc) chyby. Veškerý feedback je vítán.
 \n
-\nRiotX podporuje: • Přihlášní do existujícího účtu  • Založení místnosti a vstup do veřejných místností  • Přijetí a odmítnutí pozvánek  • Seznam místností uživatelů  • Náhled podrobností místnosti  • Odesílání textových zpráv  • Odesílání příloh  • Čtení a psaní zpráv v zašifrovaných místnostech  • Krypto: záloha klíčů E2E, pokročilé ověření zařízení, požadavek na sdílení klíče a jeho uspokojení   • Push oznámení  • Světlý, tmavý a černý motiv
+\nElement podporuje: • Přihlášní do existujícího účtu  • Založení místnosti a vstup do veřejných místností  • Přijetí a odmítnutí pozvánek  • Seznam místností uživatelů  • Náhled podrobností místnosti  • Odesílání textových zpráv  • Odesílání příloh  • Čtení a psaní zpráv v zašifrovaných místnostech  • Krypto: záloha klíčů E2E, pokročilé ověření zařízení, požadavek na sdílení klíče a jeho uspokojení   • Push oznámení  • Světlý, tmavý a černý motiv
 \n
-\nJeště nejsou všechny funkce Riotu v RiotX implementovány. Hlavní chybějící funkce (přijdou brzy!): • Nastavení místnosti (seznam členů místnosti, atd.) • Hovory • Widgety • …"</string>
+\nJeště nejsou všechny funkce Elementu v Element implementovány. Hlavní chybějící funkce (přijdou brzy!): • Nastavení místnosti (seznam členů místnosti, atd.) • Hovory • Widgety • …"</string>
 
     <string name="bottom_action_people_x">Přímé zprávy</string>
 
@@ -1768,7 +1768,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 \n
 \nPokud si dále nepřejete vidět obsah tohoto uživatele, můžete jej zablokovat a tím skrýt jejich zprávy</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot potřebuje práva k uložení Vašich E2E klíčů na disk.
+    <string name="permissions_rationale_msg_keys_backup_export">Element potřebuje práva k uložení Vašich E2E klíčů na disk.
 \n
 \nProsím, povolte přístup v příštím dialogu, abyste mohli exportovat své klíče manuálně.</string>
 
@@ -1812,18 +1812,18 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="login_continue">Pokračovat</string>
     <string name="login_connect_to">Připojit k %1$s</string>
-    <string name="login_connect_to_modular">Připojit k Modular</string>
+    <string name="login_connect_to_modular">Připojit k Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Upravit připojení k serveru</string>
     <string name="login_signin_to">Přihlásit se na %1$s</string>
     <string name="login_signup">Založit účet</string>
     <string name="login_signin">Přihlásit se</string>
     <string name="login_signin_sso">Pokračovat s SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Adresa Modular</string>
+    <string name="login_server_url_form_modular_hint">Adresa Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Adresa</string>
     <string name="login_server_url_form_modular_text">Prémiový hosting pro organizace</string>
-    <string name="login_server_url_form_modular_notice">Zadejte adresu Modular RIot nebo serveru, který chcete použít</string>
-    <string name="login_server_url_form_other_notice">Zadejte adresu serveru nebo Riotu, k němuž se chcete připojit</string>
+    <string name="login_server_url_form_modular_notice">Zadejte adresu Modular Element nebo serveru, který chcete použít</string>
+    <string name="login_server_url_form_other_notice">Zadejte adresu serveru nebo Elementu, k němuž se chcete připojit</string>
 
     <string name="login_sso_error_message">Při načítání stránky došlo k chybě: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikace se nemůže přihlásit k tomuto homeserveru. Homeserver podporuje následující typy přihlášení: %1$s.
@@ -1895,7 +1895,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 \nZastavit registrační proces\?</string>
 
     <string name="login_a11y_choose_matrix_org">Vybrat matrix.org</string>
-    <string name="login_a11y_choose_modular">Vybrat modular</string>
+    <string name="login_a11y_choose_modular">Vybrat Element Matrix Services</string>
     <string name="login_a11y_choose_other">Vybrat upravený homeserver</string>
     <string name="login_a11y_captcha_container">Prosím, proveďte vybídnutí captcha</string>
     <string name="login_terms_title">Přijmout všeobecné podmínky a pokračovat</string>
@@ -1941,7 +1941,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 \nPro přístup k účtu a zprávám se znovu se přihlaste.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Ztratíte přístup k šifrovaným zprávám, pokud se nepřihlásíte za účelem obnovy šifrovacích klíčů.</string>
     <string name="soft_logout_clear_data_dialog_submit">Vyčistit data</string>
-    <string name="soft_logout_sso_not_same_user_error">Tato relace je pro uživatele %1$s a Vy jste zadali údaje pro uživatele %2$s. RiotX toto nepodporuje.
+    <string name="soft_logout_sso_not_same_user_error">Tato relace je pro uživatele %1$s a Vy jste zadali údaje pro uživatele %2$s. Element toto nepodporuje.
 \nProsím, nejdříve vyčistěte data a pak se přihlaste k jinému účtu.</string>
 
     <string name="permalink_malformed">Váš odkaz matrix.to byl chybný</string>
@@ -1964,7 +1964,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="autocomplete_limited_results">Ukazuji jen první výsledky, zadejte více znaků…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX se může zbořit častěji, když se objeví neočekávané chyby</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element se může zbořit častěji, když se objeví neočekávané chyby</string>
 
     <string name="command_description_verify">Požadavek ověření daného uživatelského ID</string>
     <string name="command_description_shrug">Předsune ¯\\_(ツ)_/¯ do textové zprávy</string>
@@ -2056,9 +2056,9 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="room_member_jump_to_read_receipt">Přeskočit k potvrzení přečtení</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX neobstarává události typu \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX neobstarává zprávy typu \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX narazil na chybu při převádění obsahu události s id \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element neobstarává události typu \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element neobstarává zprávy typu \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element narazil na chybu při převádění obsahu události s id \'%1$s\'</string>
 
     <string name="unignore">Odignorovat</string>
 
@@ -2192,7 +2192,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Klíče jsou již aktuální!</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Požadavky na klíče</string>
 
@@ -2356,13 +2356,13 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="no_connectivity_to_the_server_indicator_airplane">Režim letadlo je zapnut</string>
 
-    <string name="use_other_session_content_description">Použijte na svých zařízeních nejnovější Riot, Riot Web, Riot Desktop, Riot iOS, RiotX pro Android nebo jiný Matrix klient schopný křížového přihlášení</string>
-    <string name="riot_desktop_web">Riot Web
-\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X pro Android</string>
+    <string name="use_other_session_content_description">Použijte na svých zařízeních nejnovější Element, Element Web, Element Desktop, Element iOS, Element pro Android nebo jiný Matrix klient schopný křížového přihlášení</string>
+    <string name="riot_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="riot_ios_android">Element iOS
+\nElement pro Android</string>
     <string name="or_other_mx_capabale_client">nebo jiný Matrix klient schopný křížového přihlášení</string>
-    <string name="use_latest_riot">Použijte na svých zařízeních nejnovější Riot:</string>
+    <string name="use_latest_riot">Použijte na svých zařízeních nejnovější Element:</string>
     <string name="command_description_discard_session">Vynutí zahození probíhající skupinové relace v šifrované místnosti</string>
     <string name="command_description_discard_session_not_handled">Podporováno jen v šifrovaných místnostech</string>
     <string name="enter_secret_storage_passphrase_or_key">Použijte své %1$s nebo použijte svůj %2$s a pokračujte.</string>
@@ -2411,11 +2411,11 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="open_terms_of">Otevřít všeobecné podmínky %s</string>
     <string name="disconnect_identity_server_dialog_content">Odpojit se od serveru identit %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Tento server identit je zastaralý. RiotX podporuje jen API V2.</string>
+    <string name="identity_server_error_outdated_identity_server">Tento server identit je zastaralý. Element podporuje jen API V2.</string>
     <string name="identity_server_error_outdated_home_server">Tato operace není možná. Domovský server je zastaralý.</string>
     <string name="identity_server_error_no_identity_server_configured">Prosím, nejdříve nastavit server identit.</string>
     <string name="identity_server_error_terms_not_signed">Prosím, přijměte nejdříve všeobecné podmínky serveru identit v nastavení.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pro Vaše soukromí, RiotX podporuje jen odesílání hašovaných emailových adress a telefonních čísel.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Pro Vaše soukromí, Element podporuje jen odesílání hašovaných emailových adress a telefonních čísel.</string>
     <string name="identity_server_error_binding_error">Propojení selhalo.</string>
     <string name="identity_server_error_no_current_binding_error">S tímto identifikátorem neexistuje žádné propojení.</string>
 
diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index 411a8d4099..5e92032c0d 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -82,7 +82,7 @@
     <string name="user_directory_header">Bruger katalog</string>
     <string name="matrix_only_filter">Kun Matrix kontakter</string>
     <string name="no_conversation_placeholder">Ingen samtaler</string>
-    <string name="no_contact_access_placeholder">Du gav ikke Riot tilladelse til at se dine lokale kontakter</string>
+    <string name="no_contact_access_placeholder">Du gav ikke Element tilladelse til at se dine lokale kontakter</string>
     <string name="no_result_placeholder">Ingen resultater</string>
 
     <string name="rooms_header">Rum</string>
@@ -238,25 +238,25 @@ Beklager ulejligheden.</string>
     <string name="media_picker_cannot_record_video">Kan ikke optage video</string>
 
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Riot skal bruge tilladelse til at tilgå dit billed- og videoarkiv for at sende og gemme vedhæftninger.
+    <string name="permissions_rationale_msg_storage">Element skal bruge tilladelse til at tilgå dit billed- og videoarkiv for at sende og gemme vedhæftninger.
 Giv venligst tilladelse ved næste pop-up for at kunne sende filer fra din telefon.</string>
-    <string name="permissions_rationale_msg_camera">Riot skal bruge tilladelse til at bruge dit kamera for at billeder og lave videoopkald.</string>
+    <string name="permissions_rationale_msg_camera">Element skal bruge tilladelse til at bruge dit kamera for at billeder og lave videoopkald.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Giv venligst tilladelse ved næste pop-up for at kunne lave opkald.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot skal bruge tilladelse til at bruge din mikrofon for at lave lydopkald.</string>
+    <string name="permissions_rationale_msg_record_audio">Element skal bruge tilladelse til at bruge din mikrofon for at lave lydopkald.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Giv venligst tilladelse ved næste pop-up for at kunne lave opkaldet.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot skal bruge tilladelse til at bruge dit kamera og din mikrofon for at lave videoopkald.
+    <string name="permissions_rationale_msg_camera_and_audio">Element skal bruge tilladelse til at bruge dit kamera og din mikrofon for at lave videoopkald.
 
 Giv venligst tilladelse ved næste pop-up for at lave opkaldet.</string>
-    <string name="permissions_rationale_msg_contacts">Riot skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
+    <string name="permissions_rationale_msg_contacts">Element skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
 
-Giv venligst tilladelse ved næste pop-up for at finde kontakter der er på Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
+Giv venligst tilladelse ved næste pop-up for at finde kontakter der er på Element.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
 
-Vil du give Riot adgang til dine kontakter?</string>
+Vil du give Element adgang til dine kontakter?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Beklager… Handlingen blev ikke udført fordi der mangler tilladelser</string>
 
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 9f9108da35..b6afec5775 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -84,7 +84,7 @@
     <string name="local_address_book_header">Lokales Adressbuch</string>
     <string name="matrix_only_filter">Nur Matrix-Kontakte</string>
     <string name="no_conversation_placeholder">Keine Konversationen</string>
-    <string name="no_contact_access_placeholder">Sie haben Riot nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
+    <string name="no_contact_access_placeholder">Sie haben Element nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
     <string name="no_result_placeholder">Keine Ergebnisse</string>
 
     <!-- Rooms fragment -->
@@ -245,20 +245,20 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Riot benötigt die Berechtigung, auf deine Fotos und Videos zugreifen zu können, um Anhänge zu senden und zu speichern.\n\nBitte erlaube den Zugriff im nächsten Dialog, um Dateien von deinem Gerät zu versenden.</string>
-    <string name="permissions_rationale_msg_camera">Riot benötigt die Berechtigung, auf deine Kamera zugreifen zu können, um Bilder aufzunehmen und Video-Anrufe durchzuführen.</string>
+    <string name="permissions_rationale_msg_storage">Element benötigt die Berechtigung, auf deine Fotos und Videos zugreifen zu können, um Anhänge zu senden und zu speichern.\n\nBitte erlaube den Zugriff im nächsten Dialog, um Dateien von deinem Gerät zu versenden.</string>
+    <string name="permissions_rationale_msg_camera">Element benötigt die Berechtigung, auf deine Kamera zugreifen zu können, um Bilder aufzunehmen und Video-Anrufe durchzuführen.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf zu durchzuführen."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot benötigt die Berechtigung, auf dein Mikrofon zugreifen zu können, um (Sprach-)Anrufe tätigen zu können.</string>
+    <string name="permissions_rationale_msg_record_audio">Element benötigt die Berechtigung, auf dein Mikrofon zugreifen zu können, um (Sprach-)Anrufe tätigen zu können.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot benötigt die Berechtigung, auf deine Kamera und dein Mikrofon zugreifen zu können, um Video-Anrufe durchführen zu können.
+    <string name="permissions_rationale_msg_camera_and_audio">Element benötigt die Berechtigung, auf deine Kamera und dein Mikrofon zugreifen zu können, um Video-Anrufe durchführen zu können.
 
 Bitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</string>
-    <string name="permissions_rationale_msg_contacts">Riot kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden.
+    <string name="permissions_rationale_msg_contacts">Element kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden.
 \nStimmst du der Nutzung deines Adressbuchs zu diesem Zweck zu\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Entschuldige. Die Aktion wurde aufgrund fehlender Berechtigungen nicht ausgeführt</string>
@@ -650,7 +650,7 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="encryption_information_verify_device_warning2">Falls sie nicht übereinstimmen, wurde die Kommunikation vielleicht kompromittiert.</string>
     <string name="encryption_information_verify_key_match">Ich bestätige, dass die Schlüssel übereinstimmen</string>
 
-    <string name="e2e_enabling_on_app_update">Riot unterstützt jetzt Ende-zu-Ende-Verschlüsselung, du musst dich jedoch erneut anmelden, um sie zu aktivieren.
+    <string name="e2e_enabling_on_app_update">Element unterstützt jetzt Ende-zu-Ende-Verschlüsselung, du musst dich jedoch erneut anmelden, um sie zu aktivieren.
 
 Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string>
 
@@ -893,7 +893,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="settings_notification_privacy_message_content_not_shown">• Benachrichtigungen werden <b>den Nachrichteninhalt nicht anzeigen</b></string>
 
     <string name="startup_notification_privacy_title">Benachrichtungs-Datenschutz</string>
-    <string name="startup_notification_privacy_message">Riot.im kann im Hintergrund laufen um deine Benachrichtigungen sicher und privat zu verwalten. Dies kann den Energieverbrauch beeinflussen.</string>
+    <string name="startup_notification_privacy_message">Element kann im Hintergrund laufen um deine Benachrichtigungen sicher und privat zu verwalten. Dies kann den Energieverbrauch beeinflussen.</string>
     <string name="startup_notification_privacy_button_grant">Berechtigung gewähren</string>
     <string name="startup_notification_privacy_button_other">Wähle eine andere Option</string>
 
@@ -906,8 +906,8 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="settings_deactivate_my_account">Deaktivere meinen Account</string>
 
     <string name="settings_opt_in_of_analytics">Sende Analysedaten</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot sammelt anonyme Analysedaten um uns zu helfen, die App zu verbessern.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Bitte aktive Analysedaten um uns zu helfen Riot zu verbessern.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element sammelt anonyme Analysedaten um uns zu helfen, die App zu verbessern.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Bitte aktive Analysedaten um uns zu helfen Element zu verbessern.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, ich möchte helfen!</string>
 
     <string name="widget_integration_missing_parameter">Ein benötigter Parameter fehlt.</string>
@@ -935,7 +935,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="e2e_re_request_encryption_key_sent">Schlüsselanfrage gesendet.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Anfrage gesendet</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Bitte öffne Riot auf einem anderen Gerät, das die Nachricht entschlüsseln kann, damit es die Schlüssel an diese Sitzung senden kann.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Bitte öffne Element auf einem anderen Gerät, das die Nachricht entschlüsseln kann, damit es die Schlüssel an diese Sitzung senden kann.</string>
 
     <string name="lock_screen_hint">Hier tippen…</string>
 
@@ -1080,7 +1080,7 @@ Du kannst sie jetzt aktivieren oder später über das Einstellungsmenü.</string
     <string name="settings_show_avatar_display_name_changes_messages">Zeige Konto-Ereignisse</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Enthält Änderungen des Profilbilds und des Anzeigenamens.</string>
     <string name="settings_call_category">Anrufe</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Nutze den Standard-Klingelton von Riot für eingehende Anrufe</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Nutze den Standard-Klingelton von Element für eingehende Anrufe</string>
     <string name="settings_call_ringtone_title">Klingelton für eingehende Anrufe</string>
     <string name="settings_call_ringtone_dialog_title">Wähle Klingelton für Anrufe:</string>
 
@@ -1110,10 +1110,10 @@ Bitte überprüfe die Kontoeinstellungen.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sitzungseinstellungen.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Benachrichtigungen sind für diese Sitzung aktiviert.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Benachrichtigungen sind für diese Sitzung nicht aktiviert. 
-\nBitte überprüfe die Einstellungen für Riot.</string>
+\nBitte überprüfe die Einstellungen für Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktiviere</string>
 
-    <string name="settings_troubleshoot_test_play_services_failed">Riot benutzt Google Play Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
+    <string name="settings_troubleshoot_test_play_services_failed">Element benutzt Google Play Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Repariere Play-Dienste</string>
 
@@ -1139,19 +1139,19 @@ Versuche die Anwendung neuzustarten.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Starte beim Hochfahren</string>
     <string name="settings_troubleshoot_test_service_boot_success">Dienst wird starten, wenn das Gerät neu gestartet wird.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Dieser Dienst wird nicht starten, wenn das Gerät neu gestartet wird. Du wirst keine Benachrichtigungen bekommen bis Riot einmal geöffnet wurde.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Dieser Dienst wird nicht starten, wenn das Gerät neu gestartet wird. Du wirst keine Benachrichtigungen bekommen bis Element einmal geöffnet wurde.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktiviere das Starten beim Hochfahren</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Überprüfe Hintergrund-Einschränkungen</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Hintergrund-Einschränkungen sind für Riot deaktiviert. Dieser Test sollte über mobile Daten ausgeführt werden (kein WLAN).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Hintergrund-Einschränkungen sind für Element deaktiviert. Dieser Test sollte über mobile Daten ausgeführt werden (kein WLAN).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Hintergrund-Einschränkungen sind für Riot aktiviert.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Hintergrund-Einschränkungen sind für Element aktiviert.
 \nDie App wird aggressiv eingeschränkt, während sie im Hintergrund arbeiten möchte. Dies könnte Benachrichtigungen beeinflussen.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Einschränkungen deaktivieren</string>
 
     <string name="settings_troubleshoot_test_battery_title">Batterieoptimierung</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot wird nicht von Batterieoptimierungen beeinflusst.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element wird nicht von Batterieoptimierungen beeinflusst.</string>
     <string name="settings_notification_troubleshoot">Fehler bei Benachrichtigungen finden</string>
     <string name="settings_troubleshoot_diagnostic">Diagnose von Fehlern</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose ist OK. Wenn du immer noch keine Benachrichtigungen bekommst, sende bitte einen Fehlerbericht, um uns beim nachforschen zu helfen.</string>
@@ -1162,8 +1162,8 @@ Versuche die Anwendung neuzustarten.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriere Optimierungen</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Hintergrundverbindung</string>
-    <string name="startup_notification_fdroid_battery_optim_message">"Riot muss eine  Hintergrundverbindung (nur geringe Belastung) aufrechterhalten, um verlässliche Benachrichtigungen zu erhalten.
-\nAuf dem nächsten Bildschirm wirst Du gefragt, ob Du Riot erlauben möchtest im Hintergrund zu laufen. Bitte akzeptieren."</string>
+    <string name="startup_notification_fdroid_battery_optim_message">"Element muss eine  Hintergrundverbindung (nur geringe Belastung) aufrechterhalten, um verlässliche Benachrichtigungen zu erhalten.
+\nAuf dem nächsten Bildschirm wirst Du gefragt, ob Du Element erlauben möchtest im Hintergrund zu laufen. Bitte akzeptieren."</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Berechtigung gewähren</string>
 
     <string name="account_email_error">Beim Verifizieren deiner E-Mail-Adresse trat ein Fehler auf.</string>
@@ -1173,17 +1173,17 @@ Versuche die Anwendung neuzustarten.</string>
 
     <string name="no_valid_google_play_services_apk">Keine validen Google-Play-Dienste gefunden. Benachrichtigungen könnten nicht richtig funktionieren.</string>
 
-    <string name="store_title">Riot.im - Kommuniziere auf deine Weise</string>
+    <string name="store_title">Element - Kommuniziere auf deine Weise</string>
     <string name="store_short_description">Eine universelle, sichere Chat-App - komplett unter deiner Kontrolle.</string>
-    <string name="store_full_description">Eine Chat-App unter deiner Kontrolle und total flexibel. Riot lässt dich auf die Art kommunizieren, wie du willst. Die App wurde gemacht für [matrix] - dem Standard für offene, dezentrale Komunikation.
+    <string name="store_full_description">Eine Chat-App unter deiner Kontrolle und total flexibel. Element lässt dich auf die Art kommunizieren, wie du willst. Die App wurde gemacht für [matrix] - dem Standard für offene, dezentrale Komunikation.
 \n
 \nHole dir ein kostenloses Konto auf matrix.org, hol dir einen eigenen Server auf https://modular.im oder nutze einen anderen Matrix-Server.
 \n
-\nWarum solltest du Riot.im wählen\?
+\nWarum solltest du Element wählen\?
 \n
 \n• KOMPLETTE KOMMUNIKATION: Baue Räume um deine Teams, deine Freunde, deine Community - wie auch immer du willst! Chatte, teile Dateien, füge Widgets hinzu und führe Sprach- und Videotelefonate - alles kostenlos.
 \n
-\n• MÄCHTIGE INTEGRATIONEN: Benutze Riot.im mit den Werkzeugen die du kennst und liebst. Mit Riot.im kannst du sogar mit Personen und Gruppen chatten, die andere Chat-Anwendungen benutzen.
+\n• MÄCHTIGE INTEGRATIONEN: Benutze Element mit den Werkzeugen die du kennst und liebst. Mit Element kannst du sogar mit Personen und Gruppen chatten, die andere Chat-Anwendungen benutzen.
 \n
 \n• PRIVAT UND SICHER: Halte deine Konversationen geheim. Aktuellste Ende-zu-Ende-Verschlüsselung sorgt dafür, dass deine private Kommunikation auch privat bleibt.
 \n
@@ -1193,7 +1193,7 @@ Versuche die Anwendung neuzustarten.</string>
 
     <string name="video_call_in_progress">Videogespräch aktiv…</string>
 
-    <string name="store_whats_new">"An Riot.im werden ständig Änderungen und Verbesserungen durchgeführt.
+    <string name="store_whats_new">"An Element werden ständig Änderungen und Verbesserungen durchgeführt.
 Das vollständige Änderungsprotokoll ist hier zu finden: %1$s.
 Um sicherzustellen, dass du nichts verpasst, lass deine Updates einfach aktiviert."</string>
     <string name="title_activity_keys_backup_setup">Schlüssel-Sicherung</string>
@@ -1222,7 +1222,7 @@ Um sicherzustellen, dass du nichts verpasst, lass deine Updates einfach aktivier
     <string name="passphrase_empty_error_message">Bitte eine Passphrase eingeben</string>
     <string name="passphrase_passphrase_too_weak">Passphrase ist zu schwach</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Bitte lösche die Passphrase, wenn Riot einen Wiederherstellungs-Schlüssel erzeugen soll.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Bitte lösche die Passphrase, wenn Element einen Wiederherstellungs-Schlüssel erzeugen soll.</string>
     <string name="keys_backup_no_session_error">Keine Matrix-Sitzung verfügbar</string>
 
     <string name="keys_backup_setup_step1_title">Verliere nie wieder verschlüsselte Nachrichten</string>
@@ -1254,11 +1254,11 @@ Um sicherzustellen, dass du nichts verpasst, lass deine Updates einfach aktivier
     <string name="settings_notification_by_event">Wichtigkeit der Benachrichtigung nach Ereignis</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Dieser Fehler ist außerhalb von Riot passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den Durchschnittsnutzer nicht betreffen.</string>
+Dieser Fehler ist außerhalb von Element passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den Durchschnittsnutzer nicht betreffen.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nDieser Fehler liegt nicht unter der Kontrolle von Riot. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.</string>
+\nDieser Fehler liegt nicht unter der Kontrolle von Element. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Dieser Fehler ist außerhalb von Riot passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
+Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
     <string name="settings_cryptography_manage_keys">Verwaltung der Krypto-Schlüssel</string>
     <string name="encryption_settings_manage_message_recovery_summary">Schlüssel-Sicherung verwalten</string>
 
@@ -1399,7 +1399,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="autodiscover_invalid_response">Ungültige Antwort beim Entdecken des Heimservers</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveroptionen vervollständigen</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot hat eine benutzerdefinierte Serverkonfiguration für die Domäne deines Benutzernamens gefunden \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element hat eine benutzerdefinierte Serverkonfiguration für die Domäne deines Benutzernamens gefunden \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Nutze Konfiguration</string>
 
@@ -1517,7 +1517,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="group_all_communities">Alle Gemeinschaften</string>
 
     <string name="room_preview_no_preview">Für diesen Raum kann keine Vorschau angezeigt werden</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Die Vorschau von öffentlichen Räumen wird von RiotX noch nicht unterstützt</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Die Vorschau von öffentlichen Räumen wird von Element noch nicht unterstützt</string>
 
     <string name="fab_menu_create_room">Räume</string>
     <string name="fab_menu_create_chat">Direktnachrichten</string>
@@ -1557,7 +1557,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="keys_backup_unable_to_get_keys_backup_data">Beim Abrufen der Schlüsselsicherungsdaten ist ein Fehler aufgetreten</string>
 
     <string name="alpha_disclaimer_title">Willkommen in der Beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Während sich RiotX in der frühen Entwicklung befindet, fehlen möglicherweise einige Funktionen und es können Fehler auftreten.</string>
+    <string name="alpha_disclaimer_content_line_1">Während sich Element in der frühen Entwicklung befindet, fehlen möglicherweise einige Funktionen und es können Fehler auftreten.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store Beschreibung</string>
     <string name="settings_sdk_version">Matrix SDK Version</string>
     <string name="settings_other_third_party_notices">Sonstige Hinweise Dritter</string>
@@ -1615,7 +1615,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="send_suggestion_sent">Vielen Dank, der Vorschlag wurde erfolgreich gesendet</string>
     <string name="send_suggestion_failed">Der Vorschlag konnte nicht gesendet werden (%s)</string>
 
-    <string name="store_riotx_title">RiotX - Matrix Client der nächsten Generation</string>
+    <string name="store_riotx_title">Element - Matrix Client der nächsten Generation</string>
     <string name="store_riotx_short_description">Ein schnellerer und leichterer Client für Matrix mit den neuesten Android-Frameworks</string>
     <string name="send_file_step_sending_thumbnail">Miniaturbild wird gesendet (%1$s / %2$s)</string>
     <string name="send_file_step_sending_file">Datei wird gesendet (%1$s / %2$s)</string>
@@ -1705,15 +1705,15 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_call_ringtone_use_default_stun_sum">Wir nutzen %s als Assistenten wenn dein Home-Server keinen anbietet (Deine IP-Adresse wird während des Anrufs geteilt)</string>
     <string name="invite_no_identity_server_error">Führe einen Identitätsserver in deinen Einstellungen hinzu um diese Aktion auszuführen.</string>
     <string name="settings_add_3pid_confirm_password_title">Passwort bestätigen</string>
-    <string name="settings_add_3pid_flow_not_supported">Du kannst dies nicht auf einem mobilen Riot tun</string>
+    <string name="settings_add_3pid_flow_not_supported">Du kannst dies nicht auf einem mobilen Element tun</string>
     <string name="settings_add_3pid_authentication_needed">Authentifizierung benötigt</string>
 
 
     <string name="settings_background_fdroid_sync_mode">Hintergrundsynchronisierungsmodus (experimentell)</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot wird sich im Hintergrund auf eine Art synchronisieren die Ressourcen des Geräts schont (Akku). 
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element wird sich im Hintergrund auf eine Art synchronisieren die Ressourcen des Geräts schont (Akku).
 \nAbhängig von dem Ressourcen-Statuses deines Geräts kann dein System die Synchronisierung verschieben.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot wird sich im Hintergrund periodisch zu einem bestimmten Zeitpunkt synchronisieren (konfigurierbar). 
-\nDies wird Funk- und Akkunutzung beeinflussen. Es wird eine permanente Benachrichtigung geben, die sagt, dass Riot auf Ereignisse lauscht.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element wird sich im Hintergrund periodisch zu einem bestimmten Zeitpunkt synchronisieren (konfigurierbar).
+\nDies wird Funk- und Akkunutzung beeinflussen. Es wird eine permanente Benachrichtigung geben, die sagt, dass Element auf Ereignisse lauscht.</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nDie Synchronisierung kann aufgrund deiner Ressourcen (Akku) oder Gerätezustands (schlafend) verschoben werden.</string>
     <string name="settings_integrations">Integrationen</string>
@@ -1742,7 +1742,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_widget_webview_access_microphone">Mikrofon benutzen</string>
     <string name="room_widget_webview_read_protected_media">Lese DRM-geschützte Medien</string>
 
-    <string name="security_warning_identity_server">Frühere Versionen von Riot hatten ein Sicherheitsproblem, welches dem Identitätsserver (%1$s) Zugriff auf deinen Account geben konnte. Wenn du %2$s vertraust, kannst du dies ignorieren – ansonsten logge dich bitte aus und wieder ein.
+    <string name="security_warning_identity_server">Frühere Versionen von Element hatten ein Sicherheitsproblem, welches dem Identitätsserver (%1$s) Zugriff auf deinen Account geben konnte. Wenn du %2$s vertraust, kannst du dies ignorieren – ansonsten logge dich bitte aus und wieder ein.
 \n
 \nWeitere Details gibt es hier (Englisch):
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1754,14 +1754,14 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="push_gateway_item_device_name">Sitzungsname:</string>
     <string name="push_gateway_item_format">Format:</string>
 
-    <string name="store_riotx_full_description">RiotX ist ein neuer Client für das Matrix-Protokoll (matrix.org): Ein offenes Netzwerk für sichere, dezentrale Kommunikation.
-\nRiotX ist der Riot-Android-Client der auf dem matrix-android-sdk basiert - aber beides komplett neu geschrieben.
+    <string name="store_riotx_full_description">Element ist ein neuer Client für das Matrix-Protokoll (matrix.org): Ein offenes Netzwerk für sichere, dezentrale Kommunikation.
+\nElement ist der Riot-Android-Client der auf dem matrix-android-sdk basiert - aber beides komplett neu geschrieben.
 \n
-\nHinweis: Dies ist eine Beta-Version. RiotX wird aktuell aktiv entwickelt und enthält Einschränkungen und (wir hoffen nicht zu viele) Fehler. Jede Rückmeldung ist willkommen!
+\nHinweis: Dies ist eine Beta-Version. Element wird aktuell aktiv entwickelt und enthält Einschränkungen und (wir hoffen nicht zu viele) Fehler. Jede Rückmeldung ist willkommen!
 \n
-\nRiotX unterstützt: • Anmelden an ein existierendes Konto • Erstelle Räume und trete öffentlichen Räumen bei • Akzeptiere und lehne Einladungen ab • Zeige Raum-Details • Sende Textnachrichten • Sende Anhänge • Lese und Schreibe Nachrichten in verschlüsselten Räumen • Verschlüsselung: Backup der Ende-zu-Ende-Schlüssel, erweiterte Geräteverifizierung, Schlüsseltauschanfragen und -antworten • Push-Benachrichtigungen • Helles, dunkles und schwarzes Thema
+\nElement unterstützt: • Anmelden an ein existierendes Konto • Erstelle Räume und trete öffentlichen Räumen bei • Akzeptiere und lehne Einladungen ab • Zeige Raum-Details • Sende Textnachrichten • Sende Anhänge • Lese und Schreibe Nachrichten in verschlüsselten Räumen • Verschlüsselung: Backup der Ende-zu-Ende-Schlüssel, erweiterte Geräteverifizierung, Schlüsseltauschanfragen und -antworten • Push-Benachrichtigungen • Helles, dunkles und schwarzes Thema
 \n
-\nNicht alle Features in Riot sind bisher in RiotX implementiert. Hauptfunktionen, die noch fehlen (und bald kommen!): • Raum-Einstellungen (Raum-Mitglieder auflisten, etc.) • Anrufe • Widgets • …</string>
+\nNicht alle Features in Element sind bisher in Element implementiert. Hauptfunktionen, die noch fehlen (und bald kommen!): • Raum-Einstellungen (Raum-Mitglieder auflisten, etc.) • Anrufe • Widgets • …</string>
 
     <string name="settings_discovery_identity_server_info">Du nutzt aktuell %1$s um vorhandene Kontakte zu finden und um von dir bekannten Kontakten gefunden zu werden.</string>
     <string name="settings_discovery_identity_server_info_none">Du benutzt aktuell keinen Identitätsserver. Um zu entdecken und um von dir bekannten Kontakten entdeckt zu werden, richte unten einen ein.</string>
@@ -1833,7 +1833,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 \n
 \nWenn du keine weiteren Inhalte dieses Nutzers mehr sehen möchtest, kannst du ihn blockieren, um seine Nachrichten auszublenden</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot benötigt Berechtigungen, um deine E2E Schlüssel zu speichern.
+    <string name="permissions_rationale_msg_keys_backup_export">Element benötigt Berechtigungen, um deine E2E Schlüssel zu speichern.
 \n
 \nBitte erlaube den Zugriff im nächsten Pop-Up sodass du deine Schlüssel manuell exportieren kannst.</string>
 
@@ -1879,14 +1879,14 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="login_splash_text3">Erweitere &amp; individualisiere dein Benutzererlebnis</string>
     <string name="login_connect_to">Verbinde mit %1$s</string>
-    <string name="login_connect_to_modular">Mit Modular verbinden</string>
+    <string name="login_connect_to_modular">Mit Element Matrix Services verbinden</string>
     <string name="login_connect_to_a_custom_server">Mit einem benutzerdefinierten Server verbinden</string>
     <string name="login_signin_to">Bei %1$s anmelden</string>
     <string name="login_signup">Registrieren</string>
     <string name="login_signin">Anmelden</string>
     <string name="login_signin_sso">Mit einmaligem Anmelden fortfahren</string>
 
-    <string name="login_server_url_form_modular_hint">Modular Adresse</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Adresse</string>
     <string name="login_server_url_form_other_hint">Adresse</string>
     <string name="login_sso_error_message">Ein Fehler beim Laden der Seite %1$s (%2$d) ist aufgetreten</string>
     <string name="login_registration_disabled">Es tut uns leid. Dieser Server akzeptiert keine neuen Benutzerkonten.</string>
@@ -1949,8 +1949,8 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_join_rules_invite">%1$s hat den Raum auf \"nur-einladen\" gestellt.</string>
     <string name="login_splash_title">Befreie deine Kommunikation</string>
     <string name="login_server_url_form_modular_text">Premium-Hosting für Organisationen</string>
-    <string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Riot oder Servers ein, den du verwenden möchtest</string>
-    <string name="login_server_url_form_other_notice">Gibt die Adresse eines Servers oder eines Riot ein, zu dem du dich verbinden möchtest</string>
+    <string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Element oder Servers ein, den du verwenden möchtest</string>
+    <string name="login_server_url_form_other_notice">Gibt die Adresse eines Servers oder eines Element ein, zu dem du dich verbinden möchtest</string>
 
     <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Heimserver anmelden. Der Heimserver unterstützt die folgenden Anmeldetypen:%1$s.
 \n
@@ -2014,7 +2014,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 \nMelde dich erneut an, um auf deine Kontodaten und Nachrichten zuzugreifen.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Du verlierst den Zugriff auf verschlüsselte Nachrichten, außer, du meldest dich an, um den Verschlüsselungsschlüssel wiederherzustellen.</string>
     <string name="soft_logout_clear_data_dialog_submit">Daten löschen</string>
-    <string name="soft_logout_sso_not_same_user_error">Die aktuelle Sitzung gehört dem/der Benutzer!n%1$s. Die angegebenen Anmeldeinformationen sind von Benutzer!n %2$s. Dies wird nicht von RiotX unterstützt.
+    <string name="soft_logout_sso_not_same_user_error">Die aktuelle Sitzung gehört dem/der Benutzer!n%1$s. Die angegebenen Anmeldeinformationen sind von Benutzer!n %2$s. Dies wird nicht von Element unterstützt.
 \nBitte zuerst die Daten löschen und dann erneut anmelden.</string>
 
     <string name="permalink_malformed">matrix.to-Link fehlerhaft</string>
@@ -2037,7 +2037,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="autocomplete_limited_results">Zeigt nur die ersten Ergebnisse, gib mehr Buchstaben ein…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Ausfallsicher</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
 
     <string name="command_description_verify">Überprüfe die angegebenen Benutzer-ID</string>
     <string name="command_description_shrug">Stellt einer Klartextnachricht ¯\\_(ツ)_/¯ voran</string>
@@ -2126,9 +2126,9 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_member_power_level_moderator_in">Moderation in %1$s</string>
     <string name="room_member_jump_to_read_receipt">Springen &amp; als gelesen markieren</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX kann keine Ereignisse vom Typ \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX beherrscht keine Nachrichten vom Typ \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX ist beim verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element kann keine Ereignisse vom Typ \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element beherrscht keine Nachrichten vom Typ \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element ist beim verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen</string>
 
     <string name="unignore">Nicht ignorieren</string>
 
@@ -2261,7 +2261,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="spoiler">Spoiler</string>
     <string name="room_member_power_level_custom_in">Benutzerdefiniert (%1$d) in %2$s</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Schlüsselanforderungen</string>
 
@@ -2400,13 +2400,13 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="error_adding_media_file_to_gallery">Datei konnte nicht zur Galerie hinzugefügt werden</string>
     <string name="change_password_summary">Neues Benutzerpasswort festlegen…</string>
 
-    <string name="use_other_session_content_description">Nutze die neueste Version von Riot auf deinen anderen Geräten, Riot Web, Riot Desktop, Riot iOS, RiotX für Android oder einen anderen cross-signing fähigen Matrix client</string>
-    <string name="riot_desktop_web">Riot Web
-\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X für Android</string>
+    <string name="use_other_session_content_description">Nutze die neueste Version von Element auf deinen anderen Geräten, Element Web, Element Desktop, Element iOS, Element für Android oder einen anderen cross-signing fähigen Matrix client</string>
+    <string name="riot_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="riot_ios_android">Element iOS
+\nElement für Android</string>
     <string name="or_other_mx_capabale_client">oder einen anderen cross-signing fähigen Matrix Client</string>
-    <string name="use_latest_riot">Nutze die neueste Version von Riot auf deinen anderen Geräten:</string>
+    <string name="use_latest_riot">Nutze die neueste Version von Element auf deinen anderen Geräten:</string>
     <string name="command_description_discard_session">Erzwingt das Verferfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
     <string name="command_description_discard_session_not_handled">Wird nur in verschlüsselten Räumen unterstützt</string>
     <string name="enter_secret_storage_passphrase_or_key">Benutze dein %1$s oder deinen %2$s um fortzufahren.</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 4b70066fe4..f56f0eec67 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -148,7 +148,7 @@
     <string name="search">Αναζήτηση</string>
 
     <string name="option_send_files">Αποστολή αρχείων</string>
-    <string name="store_short_description">Καλωσορίσατε στο Riot.im: έναν νέο κόσμο ελεύθερης επικοινωνίας!</string>
+    <string name="store_short_description">Καλωσορίσατε στο Element: έναν νέο κόσμο ελεύθερης επικοινωνίας!</string>
     <string name="x_plus">%d+</string>
     <string name="generic_label">%1$s :</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
@@ -179,7 +179,7 @@
     <string name="room_info_room_topic">Θέμα δωματίου</string>
 
     <string name="settings_call_category">Κλήσεις</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Χρήση του προεπιλεγμένου ήχου κλήσης του Riot για τις εισερχόμενες κλήσεις</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Χρήση του προεπιλεγμένου ήχου κλήσης του Element για τις εισερχόμενες κλήσεις</string>
     <string name="settings_call_ringtone_title">Ήχος εισερχομένων κλήσεων</string>
     <string name="settings_call_ringtone_dialog_title">Επιλέξτε ήχο κλήσης:</string>
 
@@ -210,7 +210,7 @@
     <string name="settings_troubleshoot_test_device_settings_title">Ρυθμίσεις συσκευής.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Οι ειδοποιήσεις είναι ενεργοποιημένες για αυτή την συσκευή.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Οι ειδοποιήσεις δεν επιτρέπονται για αυτή την συσκευή.
-Παρακαλώ ελέγξτε τις ρυθμίσεις του Riot.</string>
+Παρακαλώ ελέγξτε τις ρυθμίσεις του Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ενεργοποίηση</string>
 
     <string name="settings_devices_list">Συσκευές</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index c530d61ddd..c0b148d988 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -152,7 +152,7 @@
     <string name="direct_chats_header">Interparoloj</string>
     <string name="local_address_book_header">Loka adresaro</string>
     <string name="no_conversation_placeholder">Neniuj interparoloj</string>
-    <string name="no_contact_access_placeholder">Vi ne permesis al Riot aliron al viaj lokaj kontaktoj</string>
+    <string name="no_contact_access_placeholder">Vi ne permesis al Element aliron al viaj lokaj kontaktoj</string>
     <string name="no_result_placeholder">Neniuj rezultoj</string>
     <string name="people_no_identity_server">Neniu identiga servilo estas agordita.</string>
 
@@ -344,11 +344,11 @@
     <string name="settings_background_sync">Fona spegulado</string>
     <string name="settings_background_fdroid_sync_mode">Reĝimo de fona spegulado (eksperimenta)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimumigita por baterio</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot spegulos fone, per maniero konservanta la limigitajn rimedojn de la aparato (ĉefe la baterion).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element spegulos fone, per maniero konservanta la limigitajn rimedojn de la aparato (ĉefe la baterion).
 \nDepende de la stato de la rimedoj de via aparato, la spegulado povus esti prokrastita de la operaciumo.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimumigita por tujeco</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot spegulos fone, ripete, je preciza tempo (agordebla).
-\nĈi tio influos uzadon de baterio kaj radiilo, kaj aperigos ĉiaman sciigon pri tio, ke Riot aŭskultas okazojn.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element spegulos fone, ripete, je preciza tempo (agordebla).
+\nĈi tio influos uzadon de baterio kaj radiilo, kaj aperigos ĉiaman sciigon pri tio, ke Element aŭskultas okazojn.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Neniu fona spegulado</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Vi sciiĝos pri envenaj mesaĝoj dum la aplikaĵo estas fone.</string>
     <string name="settings_background_sync_update_error">Malsukcesis ĝisdatigi agordojn.</string>
@@ -464,7 +464,7 @@
     <string name="e2e_re_request_encryption_key_sent">Peto de ŝlosilo sendiĝis.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Peto sendiĝis.</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Bonvolu ruli Rioton sur alia aparato kiu scipovas malĉifri la mesaĝon, por ke ĝi povu sendi al vi la ŝlosilojn al ĉi tiu salutaĵo.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Bonvolu ruli Elementon sur alia aparato kiu scipovas malĉifri la mesaĝon, por ke ĝi povu sendi al vi la ŝlosilojn al ĉi tiu salutaĵo.</string>
 
     <string name="incoming_call">Envena voko</string>
     <string name="incoming_video_call">Envena vidvoko</string>
@@ -477,22 +477,22 @@
     <string name="media_picker_cannot_record_video">Ne povas filmi</string>
 
     <string name="permissions_rationale_popup_title">Informoj</string>
-    <string name="permissions_rationale_msg_storage">Riot bezonas permeson aliri viajn fotojn kaj filmojn, por sendi kaj konservi kunsendaĵojn.
+    <string name="permissions_rationale_msg_storage">Element bezonas permeson aliri viajn fotojn kaj filmojn, por sendi kaj konservi kunsendaĵojn.
 \n
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por povi sendi dosierojn el via telefono.</string>
-    <string name="permissions_rationale_msg_camera">Riot bezonas permeson aliri vian filmilon por foti kaj vidvoki.</string>
+    <string name="permissions_rationale_msg_camera">Element bezonas permeson aliri vian filmilon por foti kaj vidvoki.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por ebligi la vokon."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot bezonas permeson aliri vian mikrofonon por fari voĉvokojn.</string>
+    <string name="permissions_rationale_msg_record_audio">Element bezonas permeson aliri vian mikrofonon por fari voĉvokojn.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por ebligi la vokon."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot bezonsa premeson aliri viajn filmilon kaj mikrofonon por fari vidvokojn.
+    <string name="permissions_rationale_msg_camera_and_audio">Element bezonsa premeson aliri viajn filmilon kaj mikrofonon por fari vidvokojn.
 \n
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por ebligi la vokon.</string>
-    <string name="permissions_rationale_msg_contacts">Riot povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj. Se vi konsentas kunhavi vian adresaron por tiu celo, bonvolu permesi aliron per la sekva ŝprucpeto.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj.
+    <string name="permissions_rationale_msg_contacts">Element povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj. Se vi konsentas kunhavi vian adresaron por tiu celo, bonvolu permesi aliron per la sekva ŝprucpeto.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj.
 \n
 \nĈu vi konsentas kunhavi vian adresaron por tiu celo\?</string>
 
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 313e7737d1..0cc97e22fc 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -83,7 +83,7 @@
     <string name="local_address_book_header">Libreta local de direcciones</string>
     <string name="matrix_only_filter">Solamente contactos Matrix</string>
     <string name="no_conversation_placeholder">Sin conversaciones</string>
-    <string name="no_contact_access_placeholder">No ha permitido a Riot acceder a sus contactos locales</string>
+    <string name="no_contact_access_placeholder">No ha permitido a Element acceder a sus contactos locales</string>
     <string name="no_result_placeholder">Sin resultados</string>
 
     <!-- Rooms fragment -->
@@ -243,16 +243,16 @@ Disculpe por la inconveniencia.</string>
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
-    <string name="permissions_rationale_msg_storage">Riot necesita tu permiso para entrar en tu almacenaje de fotos y videos para enviar y guardar archivos.\n\nPor favor permite el acceso en el siguiente mensaje para poder enviar archivos desde su dispostivo.</string>
-    <string name="permissions_rationale_msg_camera">Riot necesita tu permiso para usar tu cámara para tomar fotos y hacer llamadas de video.</string>
+    <string name="permissions_rationale_msg_storage">Element necesita tu permiso para entrar en tu almacenaje de fotos y videos para enviar y guardar archivos.\n\nPor favor permite el acceso en el siguiente mensaje para poder enviar archivos desde su dispostivo.</string>
+    <string name="permissions_rationale_msg_camera">Element necesita tu permiso para usar tu cámara para tomar fotos y hacer llamadas de video.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot necesita tu permiso para usar tu micrófono para hacer llamadas de voz.</string>
+    <string name="permissions_rationale_msg_record_audio">Element necesita tu permiso para usar tu micrófono para hacer llamadas de voz.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot necesita tu permiso para usar su cámara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_contacts">Riot necesita tu permiso para leer tus contactos y directorio para encontrar a otros usuarios por sus correos electrónicos y números telefónicos.\n\nPor favor permite el acceso en el siguiente mensaje para encontrar usuarios de Riot en su directorio.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot necesita tu permiso para leer los contactos de tu directorio para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
+    <string name="permissions_rationale_msg_camera_and_audio">Element necesita tu permiso para usar su cámara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
+    <string name="permissions_rationale_msg_contacts">Element necesita tu permiso para leer tus contactos y directorio para encontrar a otros usuarios por sus correos electrónicos y números telefónicos.\n\nPor favor permite el acceso en el siguiente mensaje para encontrar usuarios de Element en su directorio.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element necesita tu permiso para leer los contactos de tu directorio para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
 
-¿Permitir el acceso a Riot para leer tus contactos ?</string>
+¿Permitir el acceso a Element para leer tus contactos ?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Perdón. Operación no realizada debido a permisos faltantes</string>
 
@@ -636,7 +636,7 @@ Disculpe por la inconveniencia.</string>
     <string name="encryption_information_verify_device_warning2">Si coinciden, seleccione Verificar. Si no, otro esta interceptando este dispositivo y vas a querer bloquearlo.\nEn el futuro, este procceso será mas sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
 
-    <string name="e2e_enabling_on_app_update">Riot ahora cuenta con cifrado de extremo-a-extremo pero necesitas reingresar tu cuenta para encenderlo.
+    <string name="e2e_enabling_on_app_update">Element ahora cuenta con cifrado de extremo-a-extremo pero necesitas reingresar tu cuenta para encenderlo.
 
 Lo puedes hacer ahora o luego desde las configuraciones de la aplicación.</string>
 
@@ -771,7 +771,7 @@ Dispositivos desconocidos:</string>
     <string name="title_activity_verify_device">Verificar dispositivo</string>
 
     <string name="settings_call_category">Llamadas</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Riot para llamadas entrantes</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
     <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
     <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
 
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 57a08046fe..af0a2df798 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -84,7 +84,7 @@
     <string name="local_address_book_header">Agenda de contactos local</string>
     <string name="matrix_only_filter">Solo contactos de Matrix</string>
     <string name="no_conversation_placeholder">No hay conversaciones</string>
-    <string name="no_contact_access_placeholder">No permitiste que Riot acceda a tus contactos locales</string>
+    <string name="no_contact_access_placeholder">No permitiste que Element acceda a tus contactos locales</string>
     <string name="no_result_placeholder">No hay resultados</string>
 
     <!-- Rooms fragment -->
@@ -248,26 +248,26 @@ Puedes añadir tu correo electrónico a tu perfil en ajustes.</string>
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
-    <string name="permissions_rationale_msg_storage">Riot necesita permiso para acceder a tu biblioteca de fotos y vídeos para enviar y guardar archivos adjuntos.
+    <string name="permissions_rationale_msg_storage">Element necesita permiso para acceder a tu biblioteca de fotos y vídeos para enviar y guardar archivos adjuntos.
 
 Por favor permite el acceso en la próxima ventana emergente para poder enviar archivos desde tu teléfono.</string>
-    <string name="permissions_rationale_msg_camera">Riot necesita permiso para acceder a tu cámara para tomar fotos y realizar llamadas de vídeo.</string>
+    <string name="permissions_rationale_msg_camera">Element necesita permiso para acceder a tu cámara para tomar fotos y realizar llamadas de vídeo.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Por favor permite el acceso en la próxima ventana emergente para poder realizar la llamada.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot necesita permiso para acceder a tu micrófono para realizar llamadas de voz.</string>
+    <string name="permissions_rationale_msg_record_audio">Element necesita permiso para acceder a tu micrófono para realizar llamadas de voz.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Por favor permite el acceso en la próxima ventana emergente para poder realizar la llamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot necesita permiso para acceder a tu cámara y micrófono para realizar llamadas de vídeo.
+    <string name="permissions_rationale_msg_camera_and_audio">Element necesita permiso para acceder a tu cámara y micrófono para realizar llamadas de vídeo.
 
 Por favor permite el acceso en las próximas ventanas emergentes para poder realizar la llamada.</string>
-    <string name="permissions_rationale_msg_contacts">Riot necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
+    <string name="permissions_rationale_msg_contacts">Element necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
 
-Por favor permite el acceso en la próxima ventana emergente para descubrir usuarios accesibles desde Riot en tu agenda de contactos.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
+Por favor permite el acceso en la próxima ventana emergente para descubrir usuarios accesibles desde Element en tu agenda de contactos.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
 
-¿Permitir que Riot acceda a tus contactos ?</string>
+¿Permitir que Element acceda a tus contactos ?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Lo sentimos. Acción no realizada, debido a que faltan permisos</string>
 
@@ -660,7 +660,7 @@ Advertencia: este archivo puede ser eliminado si la aplicación se desinstala.</
     <string name="encryption_information_verify_device_warning2">Si coincide, presione el botón de verificar a continuación. Si no coincide, entonces alguien está interceptando esta sesión y probablemente debería prohibirlo. En el futuro, este proceso de verificación será más sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
 
-    <string name="e2e_enabling_on_app_update">Riot ahora admite cifrado de extremo a extremo pero debes volver a iniciar sesión para habilitarlo.
+    <string name="e2e_enabling_on_app_update">Element ahora admite cifrado de extremo a extremo pero debes volver a iniciar sesión para habilitarlo.
 
 Puedes hacerlo ahora o más tarde desde los ajustes de la aplicación.</string>
 
@@ -941,7 +941,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="widget_integration_missing_parameter">Falta un parámetro requerido.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Solicitud enviada</string>
     <string name="speak">Conversar</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, inicia Riot en otro dispositivo que pueda descifrar el mensaje para que pueda enviar las claves a esta sesión.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, inicia Element en otro dispositivo que pueda descifrar el mensaje para que pueda enviar las claves a esta sesión.</string>
 
     <string name="dialog_title_third_party_licences">Licencias de terceros</string>
 
@@ -954,10 +954,10 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="e2e_re_request_encryption_key_sent">Solicitud de clave enviada.</string>
 
     <string name="startup_notification_privacy_title">Privacidad de Notificaciones</string>
-    <string name="startup_notification_privacy_message">Riot puede ejecutarse en segundo plano para gestionar tus notificaciones de forma segura y privada. Esto podría afectar la duración de la batería.</string>
+    <string name="startup_notification_privacy_message">Element puede ejecutarse en segundo plano para gestionar tus notificaciones de forma segura y privada. Esto podría afectar la duración de la batería.</string>
     <string name="settings_opt_in_of_analytics">Enviar datos de análisis de estadísticas</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Por favor, habilita los análisis de estadísticas para ayudarnos a mejorar Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Por favor, habilita los análisis de estadísticas para ayudarnos a mejorar Element.</string>
     <string name="lock_screen_hint">Escribe aquí…</string>
 
     <string name="send_bug_report_description_in_english">Si es posible, por favor escribe la descripción en inglés.</string>
@@ -1064,7 +1064,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="auth_accept_policies">Por favor revisa y acepta las reglas de este servidor doméstico:</string>
 
     <string name="settings_call_category">Llamadas</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Riot para llamadas entrantes</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
     <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
     <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
 
@@ -1117,7 +1117,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="settings_troubleshoot_test_device_settings_title">Ajustes de sesión.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Las notificaciones están activadas para esta sesión.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Las notificaciones no están habilitadas para esta sesión. 
-\nPor favor comprueba los ajustes Riot.</string>
+\nPor favor comprueba los ajustes Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Activar</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Ajustes personalizados.</string>
@@ -1137,17 +1137,17 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="sign_out_bottom_sheet_warning_backing_up">Copia de seguridad en progreso. Si cierras sesión ahora perderás el acceso a tus mensajes encriptados.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">La copia de seguridad debería estar activa ahora en todas tus sesiones para evitar la pérdida del acceso a tus mensajes encriptados.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot usa los servicios de Google Play para entregar mensajes Push pero no parece estar configurado correctamente:
+    <string name="settings_troubleshoot_test_play_services_failed">Element usa los servicios de Google Play para entregar mensajes Push pero no parece estar configurado correctamente:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">solucionar error con los Servicios de Google Play</string>
 
     <string name="settings_troubleshoot_test_fcm_title">Token Base</string>
     <string name="settings_troubleshoot_test_fcm_success">Token FCM recuperada correctamente:\n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Error al recuperar token FCM:\n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nEste error esta fuera del control de Riot y de acuerdo con Google, este error indica que el dispositivo tiene demasiadas apps registradas con FCM. Este error solo ocurre cuando existe un numero demasiado alto de apps por lo que no deberia afectar a un usuario promedio.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nEste error esta fuera del control de Riot. Puede ocurrir por numerosas razones. Probablemente funcione si vuelve a intentarlo mas tarde. También puede comprobar si los Servicios de Google Play están limitados por los ajustes del sistema o si la hora del dispositivo es correcta o si puede pasar en ROM personalizada.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nEste error esta fuera del control de Element y de acuerdo con Google, este error indica que el dispositivo tiene demasiadas apps registradas con FCM. Este error solo ocurre cuando existe un numero demasiado alto de apps por lo que no deberia afectar a un usuario promedio.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nEste error esta fuera del control de Element. Puede ocurrir por numerosas razones. Probablemente funcione si vuelve a intentarlo mas tarde. También puede comprobar si los Servicios de Google Play están limitados por los ajustes del sistema o si la hora del dispositivo es correcta o si puede pasar en ROM personalizada.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nEste error esta fuera del control de Riot. No hay cuenta de googled registrada en este dispositivo. Por favor abre el gestor dde cuentas y añade una cuenta de Google.</string>
+\nEste error esta fuera del control de Element. No hay cuenta de googled registrada en este dispositivo. Por favor abre el gestor dde cuentas y añade una cuenta de Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">añadir cuenta</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Token de registro</string>
@@ -1184,19 +1184,19 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="settings_troubleshoot_test_service_boot_title">Inicio automático</string>
     <string name="settings_troubleshoot_test_service_boot_success">El servicio funcionará cuando reinicie el dispositivo.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">El servicio no se iniciará al reiniciar el dispositivo, no recibirá notificaciones hasta que Riot haya sido abierto al menos 1 vez.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">El servicio no se iniciará al reiniciar el dispositivo, no recibirá notificaciones hasta que Element haya sido abierto al menos 1 vez.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">activar Inicio automático</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Comprobar restricciones en segundo plano</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Las restricciones de segundo plano están desactivadas para Riot. Este debería funcionar con datos móviles (sin WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Las restricciones de segundo plano están desactivadas para Element. Este debería funcionar con datos móviles (sin WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Las restricciones de segundo plano están activadas para Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Las restricciones de segundo plano están activadas para Element.
 \nLa app estará completamente restringida mientras esté en segundo plano y esto podría afectar a las notificaciones.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desactivar restricciones</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimización de la bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">A Riot no le afecta la Optimización de la bateria.</string>
+    <string name="settings_troubleshoot_test_battery_success">A Element no le afecta la Optimización de la bateria.</string>
     <string name="settings_troubleshoot_test_battery_failed">Si un usuario deja el dispositivo desenchufado e inmóvil durante cierto periodo de tiempo con la pantalla apagada, el dispositivo entrará en modo hibernación. Esto evita que las apps accedan a la red y postpone sus tareas, sincronizaciones y alarmas.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">ignorar optimización</string>
 
@@ -1223,8 +1223,8 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="settings_send_message_with_enter_summary">La tecla Intro enviará el mensaje en vez de añadir un salto de línea</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Conexión en segundo plano</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot necesita mantener una leve conexión en segundo plano para poder ofrecer notificaciones de confianza.
-\nEn la siguiente pantalla se le pedirá permisos para que Riot siempre funcione en segundo plano, por favor acepte.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element necesita mantener una leve conexión en segundo plano para poder ofrecer notificaciones de confianza.
+\nEn la siguiente pantalla se le pedirá permisos para que Element siempre funcione en segundo plano, por favor acepte.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Conceder permiso</string>
 
     <string name="settings_data_save_mode_summary">El modo de guardado de datos aplica un filtro específico para que las actualizaciones de presencia y las notificaciones de escritura sean eliminadas.</string>
@@ -1286,16 +1286,16 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">No se ha encontrado ningún APK válido de Servicios de Google Play. Las notificaciones podrían no funcionar correctamente.</string>
 
-    <string name="store_title">Riot.im - Comunicate a tu manera</string>
-    <string name="store_whats_new">Siempre estamos haciendo cambios y mejoras para Riot.im. Puedes encontrar el registro de cambios aquí: %1$s. Para asegurarte de que no te pierdes nada, tan solo mantén las actualizaciones activadas.</string>
+    <string name="store_title">Element - Comunicate a tu manera</string>
+    <string name="store_whats_new">Siempre estamos haciendo cambios y mejoras para Element. Puedes encontrar el registro de cambios aquí: %1$s. Para asegurarte de que no te pierdes nada, tan solo mantén las actualizaciones activadas.</string>
     <string name="store_short_description">Una app de chat universal completamente bajo tu control.</string>
-    <string name="store_full_description">Una app de chat, bajo tu total control y completamente flexible. Riot deja que te comuniques de la manera que prefieras. Hecho para [matrix] - el estándar para la comunicación abierta y descentralizada.
+    <string name="store_full_description">Una app de chat, bajo tu total control y completamente flexible. Element deja que te comuniques de la manera que prefieras. Hecho para [matrix] - el estándar para la comunicación abierta y descentralizada.
 \nConsigue tu cuenta de matrix.org gratis. Consigue tu servidor en https://modular.im o usa otro servidor de Matrix.
-\nPor qué escoger a Riot.im\?
+\nPor qué escoger a Element\?
 \n
 \n• COMUNICACIÓN COMPLETA: Crea salas para tus equipos, tus amigos, vuestra comunidad - de la forma que quieras! Chatea, comparte archivos, añade widgets y haz llamadas de voz y video - Todo de forma gratuita.
 \n
-\n• POTENTES INTEGRACIONES: Usa Riot.im con las herramientas que conoces y que mas te gustan. Con Riot.im puedes hasta chatear con usuarios y grupos de otras apps de chat.
+\n• POTENTES INTEGRACIONES: Usa Element con las herramientas que conoces y que mas te gustan. Con Element puedes hasta chatear con usuarios y grupos de otras apps de chat.
 \n
 \n• PRIVADA Y SEGURA: Mantén privadas tus conversaciones. La condición de encriptación de extremo a extremo asegura que las conversaciones privadas sigan siendo siempre privadas.
 \n
@@ -1306,7 +1306,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="passphrase_empty_error_message">Por favor introduzca una contraseña</string>
     <string name="passphrase_passphrase_too_weak">La contraseña que has introducido es muy débil</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Por favor borra la contraseña si quieres que Riot genere una clave de recuperación.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Por favor borra la contraseña si quieres que Element genere una clave de recuperación.</string>
     <string name="keys_backup_no_session_error">No hay ninguna sesión de Matrix disponible</string>
 
     <string name="keys_backup_setup_step1_title">Nunca se pierden los mensajes cifrados</string>
@@ -1407,7 +1407,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="keys_backup_info_title_signature">Firma</string>
 
     <string name="autodiscover_well_known_autofill_dialog_title">autocompletar opciones del servidor</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot ha detectado una configuración personalizada del servidor para el dominio de su ID de usuario \"%1$s\": 
+    <string name="autodiscover_well_known_autofill_dialog_message">Element ha detectado una configuración personalizada del servidor para el dominio de su ID de usuario \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Configuración de uso</string>
 
@@ -1531,7 +1531,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="group_all_communities">Todas la comunidades</string>
 
     <string name="room_preview_no_preview">Esta sala no se puede previsualizar</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">La previsualización de salas públicas no es posible todavía con RiotX</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">La previsualización de salas públicas no es posible todavía con Element</string>
 
     <string name="fab_menu_create_room">Salas</string>
     <string name="fab_menu_create_chat">Mensajes directos</string>
@@ -1548,7 +1548,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="keys_backup_unable_to_get_keys_backup_data">Error obteniendo claves para copias de respaldo</string>
 
     <string name="room_list_catchup_empty_title">!Estás al día!</string>
-    <string name="alpha_disclaimer_content_line_1">Mientras RiotX esté en desarrollo, algunas características pueden faltar y existir fallas.</string>
+    <string name="alpha_disclaimer_content_line_1">Mientras Element esté en desarrollo, algunas características pueden faltar y existir fallas.</string>
     <string name="settings_preferences">Preferencias</string>
     <string name="settings_security_and_privacy">Seguridad &amp; Privacidad</string>
     <string name="preference_voice_and_video">Voz &amp; Video</string>
@@ -1571,7 +1571,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="invite_no_identity_server_error">Para hacer esto, vaya a las opciones y añada un servidor de identidad.</string>
     <string name="settings_add_3pid_confirm_password_title">Confirme su contraseña</string>
-    <string name="settings_add_3pid_flow_not_supported">Eso no se puede hacer en Riot para móvil</string>
+    <string name="settings_add_3pid_flow_not_supported">Eso no se puede hacer en Element para móvil</string>
     <string name="settings_add_3pid_authentication_needed">Se necesita autenticación</string>
 
 
@@ -1598,10 +1598,10 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="auth_add_phone_message_2">Pon un número de teléfono para que las personas que conoces te puedan encontrar.</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Se usará %s como asistencia cuando el servidor doméstico no la ofrezca (su dirección IP se compartirá durante una llamada)</string>
     <string name="settings_background_fdroid_sync_mode">Modo sincronización en segundo plano (Experimental)</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot se sincronizará en segundo plano de manera que se preserven los recursos del dispositivo (batería).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element se sincronizará en segundo plano de manera que se preserven los recursos del dispositivo (batería).
 \nDependiendo del estado de los recursos del dispositivo, la sincronización puede ser aplazada por el sistema operativo.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot se sincronizará en segundo plano periódicamente en un momento preciso (configurable).
-\nEsto afectará al uso de la radio y la batería, se mostrará una notificación permanente que indica que Riot está escuchando a nuevos acontecimientos.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element se sincronizará en segundo plano periódicamente en un momento preciso (configurable).
+\nEsto afectará al uso de la radio y la batería, se mostrará una notificación permanente que indica que Element está escuchando a nuevos acontecimientos.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">No se le notificará de los mensajes entrantes cuando la aplicación esté en segundo plano.</string>
     <string name="settings_set_workmanager_delay">Intervalo de sincronización preferido</string>
     <string name="settings_set_workmanager_delay_summary">%s
@@ -1648,7 +1648,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="identity_server_not_defined">No estás usando ningún Servidor de Identidad</string>
     <string name="identity_server_not_defined_for_password_reset">No hay ningún Servidor de Identidad configurado, esto es requerido para restablecer tu contraseña.</string>
 
-    <string name="security_warning_identity_server">Las versiones anteriores de Riot tenían un error de seguridad que podía dar a su Servidor de Identidad (%1$s) acceso a su cuenta. Si confías en %2$s, puedes ignorar esto; de lo contrario, por favor cierra la sesión y vuelve a entrar.
+    <string name="security_warning_identity_server">Las versiones anteriores de Element tenían un error de seguridad que podía dar a su Servidor de Identidad (%1$s) acceso a su cuenta. Si confías en %2$s, puedes ignorar esto; de lo contrario, por favor cierra la sesión y vuelve a entrar.
 \n
 \nLee más detalles aquí:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1689,15 +1689,15 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="settings_labs_show_hidden_events_in_timeline">Mostrar eventos ocultos en la línea de tiempo</string>
 
-    <string name="store_riotx_title">RiotX - Cliente Matrix de Futura Generación</string>
+    <string name="store_riotx_title">Element - Cliente Matrix de Futura Generación</string>
     <string name="store_riotx_short_description">Un cliente para Matrix más rápido y ligero que usa los últimos frameworks de Android</string>
-    <string name="store_riotx_full_description">RiotX es un nuevo cliente del protocolo Matrix (Matrix.org): una red abierta para una comunicación segura y descentralizada. RiotX es una reescritura completa del cliente Riot Android, basada en una reescritura completa del SDK Matrix Android.
+    <string name="store_riotx_full_description">Element es un nuevo cliente del protocolo Matrix (Matrix.org): una red abierta para una comunicación segura y descentralizada. Element es una reescritura completa del cliente Riot Android, basada en una reescritura completa del SDK Matrix Android.
 \n
-\nDescargo de responsabilidad: Esta es una versión beta. RiotX está actualmente en desarrollo activo y contiene limitaciones y (esperamos que no demasiados) errores. Todas las sugerencias son bienvenidas!
+\nDescargo de responsabilidad: Esta es una versión beta. Element está actualmente en desarrollo activo y contiene limitaciones y (esperamos que no demasiados) errores. Todas las sugerencias son bienvenidas!
 \n
-\nRiotX soporta: - Entrar en una cuenta existente - Crear una sala y unirse a las salas públicas - Aceptar y rechazar invitaciones - Listar las salas de los usuarios - Ver los detalles de la sala - Enviar mensajes de texto - Enviar archivos adjuntos - Leer y escribir mensajes en salas cifradas - Criptografía: Copia de seguridad de claves E2E, verificación avanzada de dispositivos, solicitud y respuesta de compartir claves - Notificación push - Temas claros, oscuros y negros
+\nElement soporta: - Entrar en una cuenta existente - Crear una sala y unirse a las salas públicas - Aceptar y rechazar invitaciones - Listar las salas de los usuarios - Ver los detalles de la sala - Enviar mensajes de texto - Enviar archivos adjuntos - Leer y escribir mensajes en salas cifradas - Criptografía: Copia de seguridad de claves E2E, verificación avanzada de dispositivos, solicitud y respuesta de compartir claves - Notificación push - Temas claros, oscuros y negros
 \n
-\nNo todas las características de Riot están implementadas en RiotX todavía. Principales características que faltan (¡pronto disponibles!): - Configuración de la sala (lista de miembros de la sala, etc.) - Llamadas - Widgets - …</string>
+\nNo todas las características de Element están implementadas en Element todavía. Principales características que faltan (¡pronto disponibles!): - Configuración de la sala (lista de miembros de la sala, etc.) - Llamadas - Widgets - …</string>
 
     <string name="bottom_action_people_x">Mensajes Directos</string>
 
@@ -1834,7 +1834,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 \n
 \nSi no quieres ver más contenido de este usuario, puedes bloquearlo para ocultar sus mensajes</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot necesita permiso para guardar tus claves E2E en la memória del dispositivo.
+    <string name="permissions_rationale_msg_keys_backup_export">Element necesita permiso para guardar tus claves E2E en la memória del dispositivo.
 \n
 \nPorfavor permite el acceso en el siguiente pop-up para poder exportar tus claves manualmente.</string>
 
@@ -1877,15 +1877,15 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="login_continue">Continuar</string>
     <string name="login_connect_to">Conectarse a %1$s</string>
-    <string name="login_connect_to_modular">Conectarse a Modular</string>
+    <string name="login_connect_to_modular">Conectarse a Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Conectarse a un servidor externo</string>
     <string name="login_signin_to">Iniciar sesión en %1$s</string>
     <string name="login_signup">Registrarse</string>
     <string name="login_signin">Iniciar sesión</string>
     <string name="login_server_url_form_other_hint">Dirección</string>
     <string name="login_server_url_form_modular_text">Alojamiento de pago para organizaciones</string>
-    <string name="login_server_url_form_modular_notice">Introduzca la dirección de Modular Riot o servidor que quieres usar</string>
-    <string name="login_server_url_form_other_notice">Introduzca la dirección del servidor Riot al que quieres conectarte</string>
+    <string name="login_server_url_form_modular_notice">Introduzca la dirección de Modular Element o servidor que quieres usar</string>
+    <string name="login_server_url_form_other_notice">Introduzca la dirección del servidor Element al que quieres conectarte</string>
 
     <string name="login_sso_error_message">Se produjo un error al cargar la pagina: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">"La aplicación no es capaz de iniciar sesión en este servidor. Este solo soporta el acceso mediante:  %1$s.
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index a0b1f05e80..a259d5cb4c 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -135,7 +135,7 @@
     <string name="user_directory_header">Kasutajate kataloog</string>
     <string name="matrix_only_filter">Vaid need, kellel on Matrixi konto</string>
     <string name="no_conversation_placeholder">Vestlusi ei leidu</string>
-    <string name="no_contact_access_placeholder">Sa pole Riot\'ile andnud ligipääsu kohalikele kontaktidele</string>
+    <string name="no_contact_access_placeholder">Sa pole Element\'ile andnud ligipääsu kohalikele kontaktidele</string>
     <string name="no_result_placeholder">Tulemusi ei ole</string>
     <string name="people_no_identity_server">Isikutuvastusserver ei ole seadistatud.</string>
 
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 02f7f1e764..21f71aee49 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -74,7 +74,7 @@
     <string name="local_address_book_header">Gailuko helbide liburua</string>
     <string name="matrix_only_filter">Matrixeko kontaktuak besterik ez</string>
     <string name="no_conversation_placeholder">Elkarrizketarik ez</string>
-    <string name="no_contact_access_placeholder">Ez diozu baimena eman Riot aplikazioari zure gailuko kontaktuak atzitzeko</string>
+    <string name="no_contact_access_placeholder">Ez diozu baimena eman Element aplikazioari zure gailuko kontaktuak atzitzeko</string>
     <string name="no_result_placeholder">Emaitzarik ez</string>
 
     <string name="rooms_header">Gelak</string>
@@ -218,15 +218,15 @@ E-mail helbide bat gehitu dezakezu zure profilaren ezarpenetan.</string>
     <string name="media_picker_cannot_record_video">Ezin izan da bideoa grabatu</string>
 
     <string name="permissions_rationale_popup_title">Informazioa</string>
-    <string name="permissions_rationale_msg_camera">Riotek zure kamera atzitzeko baimena behar du argazkiak eta bideoak atera ahal izateko.</string>
+    <string name="permissions_rationale_msg_camera">Elementek zure kamera atzitzeko baimena behar du argazkiak eta bideoak atera ahal izateko.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
-    <string name="permissions_rationale_msg_record_audio">Riotek zure mikrofonoa atzitzeko baimena behar du ahots deiak egin ahal izateko.</string>
+    <string name="permissions_rationale_msg_record_audio">Elementek zure mikrofonoa atzitzeko baimena behar du ahots deiak egin ahal izateko.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riotek zure kamera eta mikrofonoa atzitzeko baimenak behar ditu bideo deiak egin ahal izateko.
+    <string name="permissions_rationale_msg_camera_and_audio">Elementek zure kamera eta mikrofonoa atzitzeko baimenak behar ditu bideo deiak egin ahal izateko.
 
 Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
     <string name="permissions_action_not_performed_missing_permissions">Ez da ekintza burutu baimenak falta direlako</string>
@@ -247,11 +247,11 @@ Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
     <string name="room_preview_invitation_format">%s erabiltzaileak gela honetara elkartzera gonbidatu zaitu</string>
     <string name="e2e_need_log_in_again">Berriro hasi behar duzu saioa muturretik muturrerako zifratzerako saio honentzako gakoak sortzeko eta gako publikoa zure hasiera zerbitzarira bidali. Hau behin bakarrik egin behar duzu. Barkatu eragozpenak.</string>
 
-    <string name="permissions_rationale_msg_storage">Riotek zure argazki eta bideoen liburutegia atzitzeko baimena behar du eranskinak gorde ahal izateko.
+    <string name="permissions_rationale_msg_storage">Elementek zure argazki eta bideoen liburutegia atzitzeko baimena behar du eranskinak gorde ahal izateko.
 
 Baimendu sarbidea hurrengo laster-leihoan zure telefonotik fitxategiak bidali ahal izateko.</string>
-    <string name="permissions_rationale_msg_contacts">Riot-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko. Honetarako zure helbide-liburua partekatzea onartzen baduzu, sakatu onartu hurrengo laster-leihoan.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko. 
+    <string name="permissions_rationale_msg_contacts">Element-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko. Honetarako zure helbide-liburua partekatzea onartzen baduzu, sakatu onartu hurrengo laster-leihoan.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko.
 \n
 \nHonetarako zure helbide-liburua partekatzea onartzen duzu\?</string>
 
@@ -609,7 +609,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="encryption_information_verify_device_warning2">Bat badator, sakatu beheko egiaztatu botoia. Ez badator bat, beste inor saioa atzematen dago eta zerrenda beltzean sartu beharko zenuke. Etorkizunean egiaztaketa metodoa hobetuko da.</string>
     <string name="encryption_information_verify_key_match">Gakoak bat datozela egiaztatu dut</string>
 
-    <string name="e2e_enabling_on_app_update">Riotek orain muturretik muturrerako zifratzea onartzen du baina berriro hasi behar duzu saioa hau gaitzeko.
+    <string name="e2e_enabling_on_app_update">Elementek orain muturretik muturrerako zifratzea onartzen du baina berriro hasi behar duzu saioa hau gaitzeko.
 
 Orain egin dezakezu edo gero aplikazioaren ezarpenetatik.</string>
 
@@ -840,7 +840,7 @@ Orain egin dezakezu edo gero aplikazioaren ezarpenetatik.</string>
     <string name="settings_notification_privacy_message_content_not_shown">• Jakinarazpenek <b>ez dute mezuaren edukia erakutsiko</b></string>
 
     <string name="startup_notification_privacy_title">Jakinarazpenen pribatutasuna</string>
-    <string name="startup_notification_privacy_message">Riot bigarren planoan aritu daiteke zure jakinarazpenak modu seguru eta pribatuan kudeatzeko. Honek baterian eragina izan lezake.</string>
+    <string name="startup_notification_privacy_message">Element bigarren planoan aritu daiteke zure jakinarazpenak modu seguru eta pribatuan kudeatzeko. Honek baterian eragina izan lezake.</string>
     <string name="startup_notification_privacy_button_grant">Eman baimena</string>
     <string name="startup_notification_privacy_button_other">Aukeratu beste zerbait</string>
 
@@ -855,8 +855,8 @@ Baten bat gehitu orain?</string>
     <string name="settings_deactivate_my_account">Desaktibatu nire kontua</string>
 
     <string name="settings_opt_in_of_analytics">Bidali analitiketarako datuak</string>
-    <string name="settings_opt_in_of_analytics_summary">Riotek analitika anonimoak biltzen ditu aplikazioa hobetzeko.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Gaitu analitikak Riot hobetzera laguntzeko.</string>
+    <string name="settings_opt_in_of_analytics_summary">Elementek analitika anonimoak biltzen ditu aplikazioa hobetzeko.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Gaitu analitikak Element hobetzera laguntzeko.</string>
     <string name="settings_opt_in_of_analytics_ok">Bai, lagundu nahi dut!</string>
 
     <string name="widget_integration_missing_parameter">Behar den parametro bat falta da.</string>
@@ -884,7 +884,7 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
     <string name="e2e_re_request_encryption_key_sent">Gako eskaria bidalita.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Eskaria bidalita</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Abiatu Riot beste mezua deszifratu dezakeen gailu batean, saio honetara gakoak bidali ditzan.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Abiatu Element beste mezua deszifratu dezakeen gailu batean, saio honetara gakoak bidali ditzan.</string>
 
     <string name="lock_screen_hint">Idatzi hemen…</string>
 
@@ -1007,7 +1007,7 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
 
     <string name="call_anyway">Deitu hala ere</string>
     <string name="settings_call_category">Deiak</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Erabili Rioten lehenetsitako dei-doinua jasotako deientzat</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Erabili Elementen lehenetsitako dei-doinua jasotako deientzat</string>
     <string name="settings_call_ringtone_title">Jasotako deien doinua</string>
     <string name="settings_call_ringtone_dialog_title">Hautatu deientzako doinua:</string>
 
@@ -1061,12 +1061,12 @@ Egiaztatu zure kontuaren ezarpenak.</string>
 
     <string name="settings_troubleshoot_test_device_settings_title">SAioaren ezarpenak.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Jakinarazpenak aktibatuta daude saio honentzat.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Jakinarazpenak ez daude aktibatuta saio honentzat. Egiaztatu Riot ezarpenak.</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">Jakinarazpenak ez daude aktibatuta saio honentzat. Egiaztatu Element ezarpenak.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktibatu</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services egiaztaketa</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK eskuragarri eta egunean dago.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot-ek Google Play Services erabiltzen du baina antza ez dago ondo konfiguratuta:
+    <string name="settings_troubleshoot_test_play_services_failed">Element-ek Google Play Services erabiltzen du baina antza ez dago ondo konfiguratuta:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Konpondu Play Services</string>
 
@@ -1093,19 +1093,19 @@ Berrabiarazi aplikazioa.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Hasi abioan</string>
     <string name="settings_troubleshoot_test_service_boot_success">Zerbitzua gailua berrabiaraztean hasiko da.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Zerbitzua ez da hasiko gailua berrabiaraztean, ez duzu jakinarazpenik jasoko Riot behin ireki arte.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Zerbitzua ez da hasiko gailua berrabiaraztean, ez duzu jakinarazpenik jasoko Element behin ireki arte.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Gaitu abioan hastea</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Egiaztatu bigarren planoko murrizketak</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Bigarren planoko murrizketak desaktibatuta daude Riot-entzat. Proba hau datu mugikorrekin egin behar da (Ez WiFi).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Bigarren planoko murrizketak desaktibatuta daude Element-entzat. Proba hau datu mugikorrekin egin behar da (Ez WiFi).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Bigarren planoko murrizketak aktibatuta daude Riot-entzat.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Bigarren planoko murrizketak aktibatuta daude Element-entzat.
 Aplikazioa egiten saiatzen ari dena agresiboki murriztuko zaio bigarren planoan dagoenean, eta honek jakinarazpenetan eragina izan dezake.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desaktibatu murrizketak</string>
 
     <string name="settings_troubleshoot_test_battery_title">Bateria optimizazioa</string>
-    <string name="settings_troubleshoot_test_battery_success">Bateria optimizazioak ez du eraginik Riot-engan.</string>
+    <string name="settings_troubleshoot_test_battery_success">Bateria optimizazioak ez du eraginik Element-engan.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ezikusi optimizazioa</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Bigaren planoko konexioa</string>
@@ -1118,20 +1118,20 @@ Aplikazioa egiten saiatzen ari dena agresiboki murriztuko zaio bigarren planoan
 
     <string name="no_valid_google_play_services_apk">Ez da baliozko Google Play Services APK-rik aurkitu. Jakinarazpenak agian ez dira ongi ibiliko.</string>
 
-    <string name="store_title">Riot.im - Komunikatu, zure erara</string>
+    <string name="store_title">Element - Komunikatu, zure erara</string>
     <string name="store_short_description">Txat seguru eta unibertsala zure kontrolpean erabat.</string>
     <string name="settings_troubleshoot_test_battery_failed">Erabiltzaile batek gailu bat deskonektatuta eta erabili gabe uzten badu denbora batez, pantaila itzalita duela, gailua kuluxka moduan sartzen da. Honek aplikazioak sarera konektatzea eragozten du eta beraien lanak atzeratzen ditu, baita ohiko alarmak.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot-ek bigarren planoko konexio arin bat behar du jakinarazpen fidagarriak izateko.
-Hurrengo pantailan Riot-i bigarren planoan aritzeko baimena eskatuko zaizu, onartu ezazu mesedez.</string>
-    <string name="store_full_description">"Txaterako aplikazio bat, zure kontrolpean eta erabat malgua. Riot-ek zuk nahi duzun eran komunikatzea ahalbidetzen dizu. [matrix] erabiltzeko egina, komunikaziorako estandar ireki eta deszentralizatua.
+    <string name="startup_notification_fdroid_battery_optim_message">Element-ek bigarren planoko konexio arin bat behar du jakinarazpen fidagarriak izateko.
+Hurrengo pantailan Element-i bigarren planoan aritzeko baimena eskatuko zaizu, onartu ezazu mesedez.</string>
+    <string name="store_full_description">"Txaterako aplikazio bat, zure kontrolpean eta erabat malgua. Element-ek zuk nahi duzun eran komunikatzea ahalbidetzen dizu. [matrix] erabiltzeko egina, komunikaziorako estandar ireki eta deszentralizatua.
 \n
 \nEskuratu matrix.org kontu bat doan, ezarri zure zerbitzari propioa  https://modular.im bidez, edo erabili beste Matrix zerbitzari bat.
 \n
-\nZergatik erabili RIot.im\?
+\nZergatik erabili Element\?
 \n
 \n* KOMUNIKAZIO OSOA: Sortu gelak zure lantalde, adiskide, edo komunitateentzat, zuk nahi bezalakoak! Txateatu, partekatu fitxategiak, gehitu trepetak eta egin ahots eta bideo deiak, den dena doan.
 \n
-\n* INTEGRAZIO AHALTSUAK: Erabili Riot.im jada ezagutu eta maite dituzun tresnekin. Riot.im erabiliz beste txat aplikazioetako erabiltzaileekin ere aritu zaitezke.
+\n* INTEGRAZIO AHALTSUAK: Erabili Element jada ezagutu eta maite dituzun tresnekin. Element erabiliz beste txat aplikazioetako erabiltzaileekin ere aritu zaitezke.
 \n
 \n* PRIBATUA ETA SEGURUA: Mantendu zure elkarrizketak sekretupean. Muturretik muturrerako zifratzeak pribatua den hori pribatu izaten jarraituko duela bermatzen du.
 \n
@@ -1141,7 +1141,7 @@ Hurrengo pantailan Riot-i bigarren planoan aritzeko baimena eskatuko zaizu, onar
 
     <string name="video_call_in_progress">Bide-deia abioan…</string>
 
-    <string name="store_whats_new">"Etengabe egiten dizkiogu hobekuntzak eta aldaketak Riot.im aplikazioari.
+    <string name="store_whats_new">"Etengabe egiten dizkiogu hobekuntzak eta aldaketak Element aplikazioari.
 Aldaketen zerrenda osoa hemen aurkitu daiteke: %1$s.
 Ezer galtzen ez duzula ziurtatzeko, mantendu eguneraketak piztuta."</string>
     <string name="title_activity_keys_backup_setup">Gakoen babes-kopia</string>
@@ -1173,7 +1173,7 @@ Ezer galtzen ez duzula ziurtatzeko, mantendu eguneraketak piztuta."</string>
     <string name="passphrase_empty_error_message">Idatzi pasaesaldia</string>
     <string name="passphrase_passphrase_too_weak">Pasaesaldia ahulegia da</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Ezabatu pasaesaldia Riot aplikazioak berreskuratze gako bat sortu dezan nahi baduzu.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Ezabatu pasaesaldia Element aplikazioak berreskuratze gako bat sortu dezan nahi baduzu.</string>
     <string name="keys_backup_no_session_error">Ez dago Matrix saiorik eskuragarri</string>
 
     <string name="keys_backup_setup_step1_title">Ez galdu inoiz zifratutako mezuak</string>
@@ -1214,11 +1214,11 @@ Ezer galtzen ez duzula ziurtatzeko, mantendu eguneraketak piztuta."</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Jakinarazpen batzuk desgaituta daude zure ezarpen pertsonaletan.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Hutsegitea arau pertsonalak kargatzean, saiatu berriro.</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Errore hau Riot-en kontroletik kanpo dago eta Google-en arabera, errore honek esan nahi du gailuko aplikazio gehiegik erabiltzen dutela FCM. Errore hau ezohiko aplikazio kopuru bat dagoenean gertatzen da, ez lioke erabiltzaile arrunt bati eragingo.</string>
+Errore hau Element-en kontroletik kanpo dago eta Google-en arabera, errore honek esan nahi du gailuko aplikazio gehiegik erabiltzen dutela FCM. Errore hau ezohiko aplikazio kopuru bat dagoenean gertatzen da, ez lioke erabiltzaile arrunt bati eragingo.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">"[%1$s]
-Errore hau Riot-en kontroletik kanpo dago. Hainbat arrazoiengatik gerta daiteke eta geroago berriro saiatzen bazara agian badabil,  egiaztatu ere Google Play Service-ek ez duela datuen erabilera mugatua sistemaren ezarpenetan, edo zure gailuaren ordua ondo ezarrita dagoela, ROM pertsonalizatuekin gertatu daiteke ere."</string>
+Errore hau Element-en kontroletik kanpo dago. Hainbat arrazoiengatik gerta daiteke eta geroago berriro saiatzen bazara agian badabil,  egiaztatu ere Google Play Service-ek ez duela datuen erabilera mugatua sistemaren ezarpenetan, edo zure gailuaren ordua ondo ezarrita dagoela, ROM pertsonalizatuekin gertatu daiteke ere."</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Errore hau Riot-en kontroletik kanpo dago. Ez dago Google konturik gailuan. Ireki kontuen kudeatzailea eta gehitu Google kontu bat.</string>
+Errore hau Element-en kontroletik kanpo dago. Ez dago Google konturik gailuan. Ireki kontuen kudeatzailea eta gehitu Google kontu bat.</string>
     <string name="keys_backup_setup_step1_description">Zifratutako geletako mezuak muturretik muturrera zifratuta daude. Hartzaileak/ek eta zuk eta ez beste inork irakurri ditzakezue mezuok.
 \n
 \nEgin zure gakoen babes-kopia segurua mezuak ez galtzeko.</string>
@@ -1352,7 +1352,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="autodiscover_invalid_response">Baliogabeko hasiera-zerbitzari deskubritze erantzuna</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Automatikoki osatu zerbitzariaren aukerak</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">"Riot-ek pertsonalizatutako zerbitzari konfigurazio bat antzeman du zure erabiltzaile id-arentzat \"%1$s\" domeinuan:
+    <string name="autodiscover_well_known_autofill_dialog_message">"Element-ek pertsonalizatutako zerbitzari konfigurazio bat antzeman du zure erabiltzaile id-arentzat \"%1$s\" domeinuan:
 \n%2$s"</string>
     <string name="autodiscover_well_known_autofill_confirm">Erabili konfigurazioa</string>
 
@@ -1484,7 +1484,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="group_all_communities">Komunitate guztiak</string>
 
     <string name="room_preview_no_preview">Gela hau ezin da aurreikusi</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Munduak irakurtzeko moduko gelaren aurrebista ez da oraindik onartzen RiotX bezeroan</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Munduak irakurtzeko moduko gelaren aurrebista ez da oraindik onartzen Element bezeroan</string>
 
     <string name="fab_menu_create_room">Gelak</string>
     <string name="fab_menu_create_chat">Mezu zuzenak</string>
@@ -1501,7 +1501,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Errore bat gertatu da gakoen babes-kopiaren datuak jasotzean</string>
 
     <string name="alpha_disclaimer_title">Ongi etorri betara!</string>
-    <string name="alpha_disclaimer_content_line_1">RiotX oraindik garapenean dagoenez, ezaugarri batzuk faltan bota ditzakezu eta akatsen bat aurkitu dezakezu.</string>
+    <string name="alpha_disclaimer_content_line_1">Element oraindik garapenean dagoenez, ezaugarri batzuk faltan bota ditzakezu eta akatsen bat aurkitu dezakezu.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">Azken ezaugarrien zerrenda hemen dago beti : %1$s, eta akatsak aurkitzen badituzu bidali mesedez akatsen txosten bat Hasiera pantailako goi ezkerreko menua erabiliz, eta ahalik eta lasterren konponduko dugu.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store-ko deskripzioa</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Akatsak aurkitzen badituzu bidali mesedez akatsen txosten bat Hasiera pantailako goi ezkerreko menua erabiliz, eta ahalik eta lasterren konponduko dugu.</string>
@@ -1542,15 +1542,15 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Erakutsi ezkutatutako gertaerak denbora lerroan</string>
 
-    <string name="store_riotx_title">RiotX - Hurrengo belaunaldiko Matrix bezeroa</string>
+    <string name="store_riotx_title">Element - Hurrengo belaunaldiko Matrix bezeroa</string>
     <string name="store_riotx_short_description">Matrix-erako bezero azkarrago eta arinago bat azken Android tresnak erabiliz eginak</string>
-    <string name="store_riotx_full_description">RiotX bezero berri bat da Matrix protokoloarentzako (Matrix.org): komunikazioa seguru eta deszentralizatuarentzako sare libre bat. RiotX Android plataformarako Riot bezeroaren berridazketa oso bat da, erabat berridatzitako Android SDK-n oinarritua. 
+    <string name="store_riotx_full_description">Element bezero berri bat da Matrix protokoloarentzako (Matrix.org): komunikazioa seguru eta deszentralizatuarentzako sare libre bat. Element Android plataformarako Riot bezeroaren berridazketa oso bat da, erabat berridatzitako Android SDK-n oinarritua.
 \n 
-\nAbisua: hau beta bertsio bat da. RiotX garapen aktiboan dago eta baditu mugak zein akatsak (gehiegi ez espero dugu). Iruzkin guztiak ongi etorriak dira! 
+\nAbisua: hau beta bertsio bat da. Element garapen aktiboan dago eta baditu mugak zein akatsak (gehiegi ez espero dugu). Iruzkin guztiak ongi etorriak dira!
 \n 
-\nRiotX bezeroak honakoa ahalbidetzen du: • Badagoen kontu batean saioa hasi • Gelak sortu eta gela publikoetara elkartu • Gonbidapenak onartu edo ukatu • Erabiltzailearen gelak zerrendatu • Gelaren xehetasunak ikusi • Testuzko mezuak bidali • Eranskinak bidali • Zifratutako geletan mezuak irakurri eta idatzi • Zifratzea: E2Egakoen babeskopia, gailuaren egiaztaketa aurreratua, gakoa partekatzeko eskaria eta erantzuna • Push jakinarazpena • Azal argia, iluna eta beltza 
+\nElement bezeroak honakoa ahalbidetzen du: • Badagoen kontu batean saioa hasi • Gelak sortu eta gela publikoetara elkartu • Gonbidapenak onartu edo ukatu • Erabiltzailearen gelak zerrendatu • Gelaren xehetasunak ikusi • Testuzko mezuak bidali • Eranskinak bidali • Zifratutako geletan mezuak irakurri eta idatzi • Zifratzea: E2Egakoen babeskopia, gailuaren egiaztaketa aurreratua, gakoa partekatzeko eskaria eta erantzuna • Push jakinarazpena • Azal argia, iluna eta beltza
 \n 
-\nEz dira oraindik Riot bezeroaren ezaugarri guztiak ezarri RiotX bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Deiak • Trepetak • …</string>
+\nEz dira oraindik Element bezeroaren ezaugarri guztiak ezarri Element bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Deiak • Trepetak • …</string>
 
     <string name="push_gateway_item_app_display_name">aplikazio_pantaila_izena:</string>
     <string name="bottom_action_people_x">Mezu zuzenak</string>
@@ -1623,11 +1623,11 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="invite_no_identity_server_error">Gehitu identitate-zerbitzari bat zure ezarpenetan ekintza hau burutzeko.</string>
     <string name="settings_background_fdroid_sync_mode">Bigarren planoko sinkronizazio modua (Esperimentala)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Bateria erabilerarako optimizatua</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot bigarren planoan sinkronizatuko da gailuaren baliabide mugatuen erabilera ahal beste murriztuz (bateria).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element bigarren planoan sinkronizatuko da gailuaren baliabide mugatuen erabilera ahal beste murriztuz (bateria).
 \nZure gailuaren baliabideen egoeraren arabera, sistema eragileak sinkronizazioa atzeratu dezake.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Denbora errealerako optimizatua</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot bigarren planoan sinkronizatuko da maiztasun finkoarekin (konfiguragarria).
-\nHonek irrati eta bateriaren erabileran eragina izango du, eta Riot gertaerei adi dagoela dion jakinarazpen bat bistaratuko da etengabe.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element bigarren planoan sinkronizatuko da maiztasun finkoarekin (konfiguragarria).
+\nHonek irrati eta bateriaren erabileran eragina izango du, eta Element gertaerei adi dagoela dion jakinarazpen bat bistaratuko da etengabe.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Ez sinkronizatu bigarren planoan</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Ez zaizu jasotako mezuei buruz jakinaraziko aplikazioa bigarren planoan dagoenean.</string>
     <string name="settings_background_sync_update_error">Huts egin du ezarpenak eguneratzean.</string>
@@ -1645,7 +1645,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="identity_server_not_defined">Ez duzu identitate zerbitzaririk erabiltzen</string>
     <string name="identity_server_not_defined_for_password_reset">Ez da identitate zerbitzaririk konfiguratu, zure pasahitza berrezartzeko beharrezkoa da.</string>
 
-    <string name="security_warning_identity_server">Riot bertsio zaharrek segurtasun akats bat zuten eta zure identitate zerbitzariak (%1$s) zure kontua atzitu zezakeen. %2$s fidagarritzat jotzen baduzu hau ezikusi dezakezu, bestela maiatu saioa eta hasi berriro.
+    <string name="security_warning_identity_server">Element bertsio zaharrek segurtasun akats bat zuten eta zure identitate zerbitzariak (%1$s) zure kontua atzitu zezakeen. %2$s fidagarritzat jotzen baduzu hau ezikusi dezakezu, bestela maiatu saioa eta hasi berriro.
 \n
 \nXehetasun gehiago hemen:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1746,14 +1746,14 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \n
 \nEz baduzu erabiltzaile honen eduki gehiago ikusi nahi, bere mezuak ezkutatzeko blokeatu dezakezu</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot-ek zure E2E gakoak diskoan gordetzeko baimena behar du.
+    <string name="permissions_rationale_msg_keys_backup_export">Element-ek zure E2E gakoak diskoan gordetzeko baimena behar du.
 \n
 \nBaimendu sarbidea hurrengo laster-leihoan zure gakoak eskuz esportatu ahal izateko.</string>
 
     <string name="no_network_indicator">Ez dago sare konexiorik orain</string>
 
     <string name="settings_add_3pid_confirm_password_title">Berretsi zure pasahitza</string>
-    <string name="settings_add_3pid_flow_not_supported">Ezin duzu hau egin mugikorrerako Riot erabiliz</string>
+    <string name="settings_add_3pid_flow_not_supported">Ezin duzu hau egin mugikorrerako Element erabiliz</string>
     <string name="settings_add_3pid_authentication_needed">Autentifikazioa behar da</string>
 
 
@@ -1826,18 +1826,18 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="login_continue">Jarraitu</string>
     <string name="login_connect_to">Konektatu %1$s zerbitzarira</string>
-    <string name="login_connect_to_modular">Konektatu Modular-era</string>
+    <string name="login_connect_to_modular">Konektatu Element Matrix Services-era</string>
     <string name="login_connect_to_a_custom_server">Konektatu zerbitzari pertsonalizatu batera</string>
     <string name="login_signin_to">Hasi saioa %1$s zerbitzarian</string>
     <string name="login_signup">Erregistratu</string>
     <string name="login_signin">Hasi saioa</string>
     <string name="login_signin_sso">Jarraitu SSO-rekin</string>
 
-    <string name="login_server_url_form_modular_hint">Modular helbidea</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services helbidea</string>
     <string name="login_server_url_form_other_hint">Helbidea</string>
     <string name="login_server_url_form_modular_text">Ordainpeko ostatatzea elkarteentzat</string>
-    <string name="login_server_url_form_modular_notice">Sartu erabili nahi duzun Modular Riot edo zerbitzariaren helbidea</string>
-    <string name="login_server_url_form_other_notice">Sartu konektatu nahi duzun zerbitzari edo Riot-aren helbidea</string>
+    <string name="login_server_url_form_modular_notice">Sartu erabili nahi duzun Modular Element edo zerbitzariaren helbidea</string>
+    <string name="login_server_url_form_other_notice">Sartu konektatu nahi duzun zerbitzari edo Element-aren helbidea</string>
 
     <string name="login_sso_error_message">Errore bat gertatu da orria kargatzean: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikazioak ezin du hasiera-zerbitzari honetan saioa hasi. Hasiera-zerbitzariak honako saio mota onartzen du: %1$s.
@@ -1910,7 +1910,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \nUtzi erregistratze prozesua\?</string>
 
     <string name="login_a11y_choose_matrix_org">Hautatu matrix.org</string>
-    <string name="login_a11y_choose_modular">Hautatu modular</string>
+    <string name="login_a11y_choose_modular">Hautatu Element Matrix Services</string>
     <string name="login_a11y_choose_other">Hautatu hasiera-zerbitzari pertsonalizatu bat</string>
     <string name="login_a11y_captcha_container">Bete captcha erronka</string>
     <string name="login_terms_title">Onartu baldintzak jarraitzeko</string>
@@ -1957,7 +1957,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \nHasi saioa berriro zure kontuaren datuak eta mezuak atzitzeko.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Zure mezu zifratuetara sarbidea galduko duzu ez baduzu saioa hasten zifratze gakoak berreskuratzeko.</string>
     <string name="soft_logout_clear_data_dialog_submit">Garbitu datuak</string>
-    <string name="soft_logout_sso_not_same_user_error">Oraingo saioa %1$s erabiltzailearena da eta %2$s erabiltzailearen kredentzialak eman dituzu. RiotX-k ez du hau onartzen.
+    <string name="soft_logout_sso_not_same_user_error">Oraingo saioa %1$s erabiltzailearena da eta %2$s erabiltzailearen kredentzialak eman dituzu. Element-k ez du hau onartzen.
 \nAurretik garbitu datuak, gero hasi saioa berriro beste kontu batekin.</string>
 
     <string name="permalink_malformed">Zure matrix.to esteka gaizki osatua dago</string>
@@ -1980,7 +1980,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="autocomplete_limited_results">Soilik lehen emaitzak erakusten, idatzi letra gehiago…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Hutsegin-azkar</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX aplikazioa ustekabeko erroreen aurrean maizago kraskatu daiteke</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element aplikazioa ustekabeko erroreen aurrean maizago kraskatu daiteke</string>
     <string name="command_description_verify">Eskatu emandako erabiltzaile IDa egiaztatzea</string>
     <string name="command_description_shrug">"Jarri ¯\\_(ツ)_/¯  testu-soileko mezuaren aurretik"</string>
 
@@ -2070,9 +2070,9 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="room_member_jump_to_read_receipt">Saltatu irakurragirira</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX aplikazioak ez ditu \'%1$s\' motako gertaerak kudeatzen</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX aplikazioak ez ditu \'%1$s\' motako mezuak kudeatzen</string>
-    <string name="rendering_event_error_exception">RiotX aplikazioak arazo bat izan du \'%1$s\' id-a duen edukia erakusteko</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element aplikazioak ez ditu \'%1$s\' motako gertaerak kudeatzen</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element aplikazioak ez ditu \'%1$s\' motako mezuak kudeatzen</string>
+    <string name="rendering_event_error_exception">Element aplikazioak arazo bat izan du \'%1$s\' id-a duen edukia erakusteko</string>
 
     <string name="unignore">Utzi ezikusteari</string>
 
@@ -2202,7 +2202,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Gakoak egunean daude jada!</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Gako eskaerak</string>
 
@@ -2344,13 +2344,13 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</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>
 
-    <string name="use_other_session_content_description">Erabili azken Riot bertsioa zure beste gailuetan, Riot Web, Riot Desktop, Riot iOS, RiotX Android plataformarako, edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
-    <string name="riot_desktop_web">Riot Web
-\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X Android plataformarako</string>
+    <string name="use_other_session_content_description">Erabili azken Element bertsioa zure beste gailuetan, Element Web, Element Desktop, Element iOS, Element Android plataformarako, edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
+    <string name="riot_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="riot_ios_android">Element iOS
+\nElement Android plataformarako</string>
     <string name="or_other_mx_capabale_client">edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
-    <string name="use_latest_riot">Erabili azken Riot bertsioa zure beste gailuetan:</string>
+    <string name="use_latest_riot">Erabili azken Element bertsioa zure beste gailuetan:</string>
     <string name="command_description_discard_session">Uneko irteerako talde saioa zifratutako gela batean baztertzera behartzen du</string>
     <string name="command_description_discard_session_not_handled">Zifratutako gelatan onartzen da soilik</string>
     <string name="enter_secret_storage_passphrase_or_key">Erabili zure %1$s edo %2$s jarraitzeko.</string>
@@ -2420,11 +2420,11 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="open_terms_of">Ireki %s zerbitzariko baldintzak</string>
     <string name="disconnect_identity_server_dialog_content">Deskonektatu %s identitate zerbitzaritik\?</string>
-    <string name="identity_server_error_outdated_identity_server">Identitate zerbitzaria zaharkituta dago. RiotX-k API V2 besterik ez du onartzen.</string>
+    <string name="identity_server_error_outdated_identity_server">Identitate zerbitzaria zaharkituta dago. Element-k API V2 besterik ez du onartzen.</string>
     <string name="identity_server_error_outdated_home_server">Ezin da eragiketa hau burutu. Hasiera-zerbitzaria zaharkituta dago.</string>
     <string name="identity_server_error_no_identity_server_configured">Konfiguratu identitate-zerbitzari bat aurretik.</string>
     <string name="identity_server_error_terms_not_signed">Onartu identitate-zerbitzariaren baldintzak aurretik zerbitzariaren ezarpenetan.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Zure pribatutasuna babesteko, RiotX-k erabiltzaileeen e-mail eta telefonoak hasheatuta bidaltzen ditu.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Zure pribatutasuna babesteko, Element-k erabiltzaileeen e-mail eta telefonoak hasheatuta bidaltzen ditu.</string>
     <string name="identity_server_error_binding_error">Asoziazioak huts egin du.</string>
     <string name="identity_server_error_no_current_binding_error">Ez dago asoziaziorik identifikatzaile honekin.</string>
 
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 23cc81310c..be706404e7 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -87,7 +87,7 @@
     <string name="local_address_book_header">Paikalliset yhteystiedot</string>
     <string name="matrix_only_filter">Ainoastaan Matrix-yhteyshenkilöt</string>
     <string name="no_conversation_placeholder">Ei keskusteluita</string>
-    <string name="no_contact_access_placeholder">Et ole sallinut Riotille pääsyä paikallisiin yhteystietoihisi</string>
+    <string name="no_contact_access_placeholder">Et ole sallinut Elementille pääsyä paikallisiin yhteystietoihisi</string>
     <string name="no_result_placeholder">Ei tuloksia</string>
 
     <!-- Rooms fragment -->
@@ -253,21 +253,21 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Huomio</string>
-    <string name="permissions_rationale_msg_storage">Riot tarvitsee käyttöluvan mediagalleriaasi lähettäkseen liitteitä.\n\nSalli tiedostojen käyttö seuraavalla näytöllä liittääksesi kuvia ja muita tiedostoja viesteihin.</string>
-    <string name="permissions_rationale_msg_camera">Riot tarvitsee käyttöluvan kameraan ottaakseen kuvia ja suorittakseen videopuheluita.</string>
+    <string name="permissions_rationale_msg_storage">Element tarvitsee käyttöluvan mediagalleriaasi lähettäkseen liitteitä.\n\nSalli tiedostojen käyttö seuraavalla näytöllä liittääksesi kuvia ja muita tiedostoja viesteihin.</string>
+    <string name="permissions_rationale_msg_camera">Element tarvitsee käyttöluvan kameraan ottaakseen kuvia ja suorittakseen videopuheluita.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nSoittaaksesi videopuhelun, salli seuraavassa ponnahdusikkunassa sovelluksen käyttää kameraa."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot tarvitsee käyttöluvan mikrofoniin suorittakseen puheluita.</string>
+    <string name="permissions_rationale_msg_record_audio">Element tarvitsee käyttöluvan mikrofoniin suorittakseen puheluita.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nSoittaaksesi äänipuhelun, salli seuraavassa ponnahdusikkunassa sovelluksen käyttää mikrofonia."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot tarvitsee käyttöluvan kameraan ja mikrofoniin suorittakseen videopuheluita.
+    <string name="permissions_rationale_msg_camera_and_audio">Element tarvitsee käyttöluvan kameraan ja mikrofoniin suorittakseen videopuheluita.
 \n
 \nSalli mikrofonin ja kameran käyttö seuraavilla näytöillä aloittaaksesi tämän puhelun.</string>
-    <string name="permissions_rationale_msg_contacts">Riot voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden ja puhelinnumeroiden perusteella. Jos suostut jakamaan yhteystietosi tätä tarkoitusta varten, salli yhteystietojen käyttö seuraavassa ponnahdusikkunassa.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden perusteella.
-\nAnnatko Riotin käyttää yhteystietojasi tätä varten\?</string>
+    <string name="permissions_rationale_msg_contacts">Element voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden ja puhelinnumeroiden perusteella. Jos suostut jakamaan yhteystietosi tätä tarkoitusta varten, salli yhteystietojen käyttö seuraavassa ponnahdusikkunassa.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden perusteella.
+\nAnnatko Elementin käyttää yhteystietojasi tätä varten\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Toimenpide epäonnistui puuttuvien käyttölupien takia</string>
 
@@ -634,7 +634,7 @@
     <string name="passphrase_confirm_passphrase">Vahvista salasana</string>
     <string name="encryption_export_saved_as">Huoneen osapuolten välisen salauksen avaimet tallennettiin tiedostoon \'%s\'
 \n
-\nVaroitus: tämä tiedosto saatetaan poistaa, mikäli Riot poistetaan.</string>
+\nVaroitus: tämä tiedosto saatetaan poistaa, mikäli Element poistetaan.</string>
 
     <string name="encryption_import_e2e_room_keys">Tuo päästä päähän -salatun huoneen avaimet</string>
     <string name="encryption_import_room_keys">Tuo huoneen avaimet</string>
@@ -661,7 +661,7 @@
 \nTulevaisuudessa tämä varmennusprosessi tulee olemaan hienostuneempi.</string>
     <string name="encryption_information_verify_key_match">Vahvistan, että avaimet täsmäävät</string>
 
-    <string name="e2e_enabling_on_app_update">Riot tukee päästä päähän -salausta. Kirjaudu sisään uudelleen ottaaksesi salaus käyttöön.
+    <string name="e2e_enabling_on_app_update">Element tukee päästä päähän -salausta. Kirjaudu sisään uudelleen ottaaksesi salaus käyttöön.
 \nVoit tehdä sen nyt tai myöhemmin sovelluksen asetuksissa.</string>
 
     <!-- unknown devices management -->
@@ -916,14 +916,14 @@ Haluatko lisätä paketteja?</string>
     <string name="e2e_re_request_encryption_key_sent">Avainpyyntö lähetetty.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Pyyntö lähetetty</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Käynnistä Riot toisella laitteella, joka voi purkaa viestin, jotta se voi lähettää avaimet tähän istuntoon.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Käynnistä Element toisella laitteella, joka voi purkaa viestin, jotta se voi lähettää avaimet tähän istuntoon.</string>
 
     <plurals name="membership_changes">
         <item quantity="one">yksi jäsenyysmuutos</item>
         <item quantity="other">%d jäsenyysmuutosta</item>
     </plurals>
 
-    <string name="settings_call_ringtone_use_riot_ringtone">Käytä Riotin oletussoittoääntä saapuville puheluille</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Käytä Elementin oletussoittoääntä saapuville puheluille</string>
     <string name="settings_call_ringtone_title">Saapuvien puheluiden soittoääni</string>
     <string name="video_call_in_progress">Videopuhelu menossa…</string>
 
@@ -1012,7 +1012,7 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_troubleshoot_test_device_settings_title">Istunnon asetukset.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Ilmoitukset ovat käytössä tässä istunnossa.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Ilmoitukset eivät ole käytössä tässä istunnossa.
-\nTarkista Riotin asetukset.</string>
+\nTarkista Elementin asetukset.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ota käyttöön</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Mukautetut asetukset.</string>
@@ -1023,7 +1023,7 @@ Haluatko lisätä paketteja?</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services -palvelun tarkistus</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK on saatavilla ja ajan tasalla.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot käyttää Google Play Services -palvelua ilmoitusten välittämiseen, mutta se ei näytä olevan määritetty oikein: 
+    <string name="settings_troubleshoot_test_play_services_failed">Element käyttää Google Play Services -palvelua ilmoitusten välittämiseen, mutta se ei näytä olevan määritetty oikein:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Korjaa Play Services -palvelu</string>
 
@@ -1033,11 +1033,11 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM-tunnisteen haku epäonnistui: 
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nTämä virhe ei ole Riotin hallinnassa ja Googlen mukaan tämä virhe tarkoittaa, että tällä laitteella on liikaa FCM:ään liittyneitä sovelluksia. Tämä virhe ilmenee vain tapauksissa, jossa on on erittäin paljon sovelluksia asennettuna, joten sen ei pitäisi vaikuttaa normaaliin käyttäjään.</string>
+\nTämä virhe ei ole Elementin hallinnassa ja Googlen mukaan tämä virhe tarkoittaa, että tällä laitteella on liikaa FCM:ään liittyneitä sovelluksia. Tämä virhe ilmenee vain tapauksissa, jossa on on erittäin paljon sovelluksia asennettuna, joten sen ei pitäisi vaikuttaa normaaliin käyttäjään.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nTämä virhe ei ole Riotin ratkaistavissa. Se voi johtua useasta eri syystä. Ehkä tämä toimii, jos yrität myöhemmin. Voit myös tarkistaa, että Google Play Services -palvelu ei ole rajoitettuna järjestelmäasetuksissa, ja että laitteesi kello on oikein. Tämä voi tapahtua myös mukautetun käyttöjärjestelmän kanssa.</string>
+\nTämä virhe ei ole Elementin ratkaistavissa. Se voi johtua useasta eri syystä. Ehkä tämä toimii, jos yrität myöhemmin. Voit myös tarkistaa, että Google Play Services -palvelu ei ole rajoitettuna järjestelmäasetuksissa, ja että laitteesi kello on oikein. Tämä voi tapahtua myös mukautetun käyttöjärjestelmän kanssa.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
-\nTämä virhe ei ole Riotin ratkaistavissa. Tässä puhelimessa ei ole Google-tiliä. Lisää laitteeseesi Google-tili tätä toimintoa varten.</string>
+\nTämä virhe ei ole Elementin ratkaistavissa. Tässä puhelimessa ei ole Google-tiliä. Lisää laitteeseesi Google-tili tätä toimintoa varten.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lisää tili</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Tunnisteen rekisteröinti</string>
@@ -1048,7 +1048,7 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">Ilmoituspalvelu</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Ilmoituspalvelu on käynnissä.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Ilmoituspalvelu ei ole käynnissä.
-\nKokeile Riotin uudelleenkäynnistystä.</string>
+\nKokeile Elementin uudelleenkäynnistystä.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Käynnistä palvelu</string>
 
     <string name="settings_troubleshoot_test_service_restart_title">Ilmoituspalvelun automaattinen uudelleenkäynnistys</string>
@@ -1057,19 +1057,19 @@ Haluatko lisätä paketteja?</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Käynnistä laitteen käynnistyessä</string>
     <string name="settings_troubleshoot_test_service_boot_success">Palvelu käynnistetään, kun laite käynnistetään uudelleen.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Palvelua ei käynnistetä laitteen uudelleenkäynnistyksen yhteydessä. Et tule saamaan ilmoituksia ennen kuin Riot on käynnistetty uudelleen.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Palvelua ei käynnistetä laitteen uudelleenkäynnistyksen yhteydessä. Et tule saamaan ilmoituksia ennen kuin Element on käynnistetty uudelleen.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Ota käyttöön automaattinen käynnistys</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Tarkista taustapalveluiden rajoitukset</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Taustapalveluiden rajoitukset ovat pois käytöstä. Tämä testi tulee ajaa mobiilidatayhteydellä (ilman wlania). 
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_failed">Taustapalveluiden rajoitukset ovat käytössä. 
-\nTyötä, jota Riot yrittää tehdä, rajoitetaan aggressiivisesti, kun se on taustalla, mikä saattaa vaikuttaa ilmoituksiin. 
+\nTyötä, jota Element yrittää tehdä, rajoitetaan aggressiivisesti, kun se on taustalla, mikä saattaa vaikuttaa ilmoituksiin.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Poista rajoitukset</string>
 
     <string name="settings_troubleshoot_test_battery_title">Akunkäytön optimointi</string>
-    <string name="settings_troubleshoot_test_battery_success">Akunkäytön optimointi ei vaikuta Riotin toimintaan.</string>
+    <string name="settings_troubleshoot_test_battery_success">Akunkäytön optimointi ei vaikuta Elementin toimintaan.</string>
     <string name="settings_troubleshoot_test_battery_failed">Jos käyttäjä jättää laitteen paikalleen ilman latausjohtoa niin, että näyttö on pois päältä, laite siirtyy torkkutilaan. Tämä estää sovelluksia käyttämästä verkkoyhteyksiä ja lykkää niiden töitä, synkronointeja ja perushälytyksiä.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Jätä optimointi huomiotta</string>
 
@@ -1096,17 +1096,17 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_show_join_leave_messages_summary">Ei vaikuta kutsuihin, poistamisiin ja porttikieltoihin.</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Sisältää hahmokuvat ja näyttönimien vaihdot.</string>
     <string name="startup_notification_privacy_title">Ilmoitusten yksityisyys</string>
-    <string name="startup_notification_privacy_message">Riot voi ajaa itseään taustalla hallitakseen sinulle näytettäviä ilmoituksia turvallisesti ja yksityisesti. Tämä voi vaikuttaa akunkäyttöön.</string>
+    <string name="startup_notification_privacy_message">Element voi ajaa itseään taustalla hallitakseen sinulle näytettäviä ilmoituksia turvallisesti ja yksityisesti. Tämä voi vaikuttaa akunkäyttöön.</string>
     <string name="startup_notification_privacy_button_grant">Anna oikeus</string>
     <string name="startup_notification_privacy_button_other">Valitse toinen vaihtoehto</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Taustayhteys</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riotin tarvitsee käyttää taustayhteyttä, jotta se voi näyttää luotettavia ilmoituksia.
-\nSeuraavalla ruudulla sinulta kysytään lupaa, jotta Riot voi pitää itsensä käynnissä taustalla.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Elementin tarvitsee käyttää taustayhteyttä, jotta se voi näyttää luotettavia ilmoituksia.
+\nSeuraavalla ruudulla sinulta kysytään lupaa, jotta Element voi pitää itsensä käynnissä taustalla.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Anna oikeus</string>
 
-    <string name="settings_opt_in_of_analytics_summary">Riot kerää anonyymiä analytiikkaa sovelluksen parantamiseksi.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Otathan analytiikan käyttöön Riotin parantamiseksi.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element kerää anonyymiä analytiikkaa sovelluksen parantamiseksi.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Otathan analytiikan käyttöön Elementin parantamiseksi.</string>
     <string name="settings_opt_in_of_analytics_ok">Kyllä, haluan auttaa!</string>
 
     <string name="settings_data_save_mode_summary">Datansäästötila ottaa käyttöön erityisen suodattimen, joka poistaa paikallaoloilmoitukset ja kirjoittamisen ilmoitukset.</string>
@@ -1145,7 +1145,7 @@ Haluatko lisätä paketteja?</string>
 
     <string name="widget_integration_missing_parameter">Vaadittu parametri puuttuu.</string>
     <string name="widget_integration_invalid_parameter">Parametri ei ole kelvollinen.</string>
-    <string name="settings_labs_native_camera_summary">Käynnistä järjestelmän kamera Riotin kameraruudun sijaan.</string>
+    <string name="settings_labs_native_camera_summary">Käynnistä järjestelmän kamera Elementin kameraruudun sijaan.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Käytä näppäimistön rivinvaihtopainiketta viestin lähettämiseen</string>
     <string name="settings_labs_enable_send_voice_summary">Tämä valinta vaatii kolmannen osapuolen sovelluksen viestien tallennukseen.</string>
 
@@ -1227,8 +1227,8 @@ Haluatko lisätä paketteja?</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Kelvollista Google Play Services APK:ta ei löytynyt. Ilmoitukset eivät ehkä toimi oikein.</string>
 
-    <string name="store_title">Riot.im - Kommunikoi, sinun tavallasi</string>
-    <string name="store_whats_new">"Olemme aina tekemässä muutoksia ja parannuksia Riot.im:ään.
+    <string name="store_title">Element - Kommunikoi, sinun tavallasi</string>
+    <string name="store_whats_new">"Olemme aina tekemässä muutoksia ja parannuksia Element:ään.
 Täydellisen muutoslokin löydät täältä: %1$s.
 Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytössä."</string>
     <string name="store_short_description">Universaali ja turvallinen keskusteluohjelma kokonaan sinun hallinnassa.</string>
@@ -1237,7 +1237,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="passphrase_empty_error_message">Syötä salalause</string>
     <string name="passphrase_passphrase_too_weak">Salalause on liian heikko</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Poista salalause, jos haluat Riotin generoivan palautusavaimen.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Poista salalause, jos haluat Element generoivan palautusavaimen.</string>
     <string name="keys_backup_no_session_error">Matrix-istuntoa ei ole saatavilla</string>
 
     <string name="keys_backup_setup_step1_title">Älä koskaan menetä salattuja viestejä</string>
@@ -1268,7 +1268,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="keys_backup_setup_step3_save_button_title">Tallenna tiedostona</string>
     <string name="recovery_key_export_saved_as_warning">Palautusavain on tallennettu kohteeseen \'%s\'.
 \n
-\nVaroitus: tämä tiedosto saatetaan poistaa, mikäli Riot poistetaan.</string>
+\nVaroitus: tämä tiedosto saatetaan poistaa, mikäli Element poistetaan.</string>
 
     <string name="keys_backup_setup_step3_please_make_copy">Teethän kopion</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Jaa palautusavain kohteelle…</string>
@@ -1378,15 +1378,15 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="notification_unread_notified_messages_in_room">%1$s -&gt; %2$s</string>
 
-    <string name="store_full_description">Keskustelusovellus, joka on sinun hallinnassasi ja erittäin joustava. Riot antaa sinun viestiä juuri sillä tavalla kuin haluat. Taustalla [matrix] – avoimen ja hajautetun viestinnän standardi. 
+    <string name="store_full_description">Keskustelusovellus, joka on sinun hallinnassasi ja erittäin joustava. Element antaa sinun viestiä juuri sillä tavalla kuin haluat. Taustalla [matrix] – avoimen ja hajautetun viestinnän standardi.
 \n
 \nHanki ilmainen matrix.org-tili, hanki oma palvelimesi osoitteesta https://modular.im tai käytä muuta Matrix-palvelinta. 
 \n
-\nMiksi valita Riot.im\?
+\nMiksi valita Element\?
 \n
 \n• Kattavat mahdollisuudet viestintään: rakenna huoneita tiimeillesi, ystävillesi ja yhteisöllesi – juuri niin kuin haluat! Keskustele, jaa tiedostoja, lisää sovelmia ja soita ääni‐ ja videopuheluita – kaikki tämä ilmaiseksi.
 \n 
-\n• Tehokkaat integraatiot: Käytä Riotia tuntemiesi työkalujen kanssa. Riot.im mahdollistaa keskustelut jopa eri keskusteluohjelmia käyttävien ihmisten ja ryhmien kanssa.
+\n• Tehokkaat integraatiot: Käytä Elementia tuntemiesi työkalujen kanssa. Element mahdollistaa keskustelut jopa eri keskusteluohjelmia käyttävien ihmisten ja ryhmien kanssa.
 \n
 \n• Yksityinen ja turvallinen: Pidä keskustelusi salaisina. Nykyaikainen osapuolten välinen salaus pitää huolen, että yksityiset keskustelut pysyvät yksityisinä. 
 \n
@@ -1399,7 +1399,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 \nJos et asettanut uutta palautustapaa, hyökkääjä saattaa yrittää päästä käsiksi tiliisi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.</string>
     <string name="autodiscover_invalid_response">Epäkelpo kotipalvelimen löytövastaus</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Automaattitäydennyksen palvelinasetukset</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot löysi mukautetun palvelinasetuksen userId:si domainille ”%1$s”:
+    <string name="autodiscover_well_known_autofill_dialog_message">Element löysi mukautetun palvelinasetuksen userId:si domainille ”%1$s”:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Käytä asetuksia</string>
 
@@ -1490,7 +1490,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="group_all_communities">Kaikki yhteisöt</string>
 
     <string name="room_preview_no_preview">Tätä huonetta ei voi esikatsella</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">RiotX ei vielä tue täysin julkisen huoneen esikatselua</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Element ei vielä tue täysin julkisen huoneen esikatselua</string>
 
     <string name="fab_menu_create_room">Huoneet</string>
     <string name="fab_menu_create_chat">Yksityisviestit</string>
@@ -1509,7 +1509,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 \nJos et kirjautunut toisella laitteella, voit jättää tämän pyynnön huomiotta.</string>
 
     <string name="alpha_disclaimer_title">Tervetuloa beetaan!</string>
-    <string name="alpha_disclaimer_content_line_1">RiotX on varhaisessa kehitysvaiheessa, mistä johtuen osa ominaisuuksista puuttuu ja saatat kohdata virheitä.</string>
+    <string name="alpha_disclaimer_content_line_1">Element on varhaisessa kehitysvaiheessa, mistä johtuen osa ominaisuuksista puuttuu ja saatat kohdata virheitä.</string>
     <string name="settings_sdk_version">Matrix SDK:n versio</string>
     <string name="settings_other_third_party_notices">Muut kolmansien osapuolten huomautukset</string>
     <string name="quick_reactions">Pikareaktiot</string>
@@ -1536,7 +1536,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="settings_labs_show_hidden_events_in_timeline">Näytä piilotetut tapahtumat aikajanalla</string>
 
-    <string name="store_riotx_title">RiotX - seuraavan sukupolven Matrix-asiakasohjelma</string>
+    <string name="store_riotx_title">Element - seuraavan sukupolven Matrix-asiakasohjelma</string>
     <string name="store_riotx_short_description">Nopeampi ja kevyempi Matrix-asiakasohjelma</string>
     <string name="bottom_action_people_x">Yksityisviestit</string>
 
@@ -1689,11 +1689,11 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="call_failed_no_ice_use_alt">Kokeile käyttää palvelinta %s</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Käyttää palvelinta %s apupalvelimena, jos kotipalvelimesi ei tarjoa sellaista (IP-osoitteesi näkyy palvelimelle puhelun aikana)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimoitu akunkestoa varten</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot synkronoi taustalla laitteen rajallisia resursseja (akkua) säästäen.
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element synkronoi taustalla laitteen rajallisia resursseja (akkua) säästäen.
 \nLaitteesi resurssien tilasta riippuen käyttöjärjestelmä saattaa lykätä synkronointia.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimoitu reaaliaikaa varten</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot synkronoi taustalla täsmällisin aikavälein (säädettävä).
-\nTämä vaikuttaa radion ja akun käyttöön. Näet pysyvän ilmoituksen, joka kertoo, että Riot kuuntelee tapahtumia.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element synkronoi taustalla täsmällisin aikavälein (säädettävä).
+\nTämä vaikuttaa radion ja akun käyttöön. Näet pysyvän ilmoituksen, joka kertoo, että Element kuuntelee tapahtumia.</string>
     <string name="message_edits">Viestimuokkaukset</string>
     <string name="terms_description_for_identity_server">Ole löydettävissä</string>
     <string name="settings_text_message_sent">Tekstiviesti on lähetetty numeroon %s. Syötä sen sisältämä varmistuskoodi.</string>
@@ -1708,7 +1708,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="auth_add_email_phone_message_2">Aseta sähköpostisi tunnuksen palautusta varten. Myöhemmin voit asettaa sähköpostisi tai puhelinnumerosi löydettäviksi, jotta sinut voi löytää näillä tiedoilla.</string>
     <string name="auth_add_email_and_phone_message_2">Aseta sähköpostisi tunnuksen palautusta varten. Myöhemmin voit asettaa sähköpostisi tai puhelinnumerosi löydettäviksi, jotta sinut voi löytää näillä tiedoilla.</string>
     <string name="settings_add_3pid_confirm_password_title">Vahvista salasanasi</string>
-    <string name="settings_add_3pid_flow_not_supported">Et voi tehdä tätä mobiili-Riotista</string>
+    <string name="settings_add_3pid_flow_not_supported">Et voi tehdä tätä mobiili-Elementista</string>
     <string name="settings_add_3pid_authentication_needed">Tunnistautuminen vaaditaan</string>
 
 
@@ -1764,7 +1764,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="sas_error_m_unknown_method">Laitteet eivät pysty sopimaan avaimista, tiivisteestä, MAC:sta tai SAS-metodista</string>
     <string name="sas_error_m_mismatched_commitment">Tiivisteet eivät täsmänneet</string>
-    <string name="security_warning_identity_server">Vanhoissa Riotin versioissa oli tietoturvaongelma, joka saattoi antaa identiteettipalvelimelle(%1$s) pääsyn tunnukseesi. Jos luotat kohteeseen %2$s, voit jättää tämän huomiotta. Muussa tapauksessa, kirjaudu ulos ja kirjaudu uudelleen Riotiin.
+    <string name="security_warning_identity_server">Vanhoissa Elementin versioissa oli tietoturvaongelma, joka saattoi antaa identiteettipalvelimelle(%1$s) pääsyn tunnukseesi. Jos luotat kohteeseen %2$s, voit jättää tämän huomiotta. Muussa tapauksessa, kirjaudu ulos ja kirjaudu uudelleen Elementiin.
 \n
 \nLue lisää:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1786,13 +1786,13 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Rekisteröi tunniste</string>
 
-    <string name="store_riotx_full_description">RiotX on uusi Matrix-protokollaa (Matrix.org) käyttävä ohjelma: avointa ja hajautettua keskustelua tukeva turvallinen verkko. RiotX on täysin uusittu versio Riot Android -ohjelmasta, joka perustuu Matrix Android SDK:n uudelleenkirjoitukseen.
+    <string name="store_riotx_full_description">Element on uusi Matrix-protokollaa (Matrix.org) käyttävä ohjelma: avointa ja hajautettua keskustelua tukeva turvallinen verkko. Element on täysin uusittu versio Riot Android -ohjelmasta, joka perustuu Matrix Android SDK:n uudelleenkirjoitukseen.
 \n
-\nHuomaa: tämä on betaversio. RiotX on vielä kehitystyössä, ja siinä on rajoitteita ja (toivottavasti ei kuitenkaan monta) bugeja. Kaikki palaute on tervetullutta!
+\nHuomaa: tämä on betaversio. Element on vielä kehitystyössä, ja siinä on rajoitteita ja (toivottavasti ei kuitenkaan monta) bugeja. Kaikki palaute on tervetullutta!
 \n
-\nRiotX tukee: • Kirjaudu olemassaolevalle tunnukselle • Luo huoneita ja liity julkisiin huoneisiin • Hyväksy ja hylkää kutsuja • Listaa käyttäjän huoneet • Katso huoneen tietoja • Lähetä tekstiviestejä • Lähetä liitteitä • Lue ja kirjoita viestejä salatuissa huoneissa • Salaus: osapuolten välisen salauksen avaimien varmuuskopiointi, edistynyt laitteiden varmennus, avainten jakopyynnöt ja vastaus • Viesti-ilmoitukset • Vaalea, tumma ja musta teema
+\nElement tukee: • Kirjaudu olemassaolevalle tunnukselle • Luo huoneita ja liity julkisiin huoneisiin • Hyväksy ja hylkää kutsuja • Listaa käyttäjän huoneet • Katso huoneen tietoja • Lähetä tekstiviestejä • Lähetä liitteitä • Lue ja kirjoita viestejä salatuissa huoneissa • Salaus: osapuolten välisen salauksen avaimien varmuuskopiointi, edistynyt laitteiden varmennus, avainten jakopyynnöt ja vastaus • Viesti-ilmoitukset • Vaalea, tumma ja musta teema
 \n
-\nKaikkia Riotin ominaisuuksia ei ole vielä toteutettu RiotX:ssä. Tärkeimmät puuttuvat (ja pian saapuvat!) ominaisuudet: • Huoneen asetukset (listaa huoneen jäsenet jne.) • Puhelut • Sovelmat • …</string>
+\nKaikkia Elementin ominaisuuksia ei ole vielä toteutettu Element:ssä. Tärkeimmät puuttuvat (ja pian saapuvat!) ominaisuudet: • Huoneen asetukset (listaa huoneen jäsenet jne.) • Puhelut • Sovelmat • …</string>
 
     <string name="send_file_step_encrypting_thumbnail">Salataan pikkukuvaa…</string>
     <string name="send_file_step_sending_thumbnail">Lähetetään pikkukuvaa (%1$s / %2$s)</string>
@@ -1838,7 +1838,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 \n
 \nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot tarvitsee oikeuden tallentaakseen osapuolten välisen salauksen avaimesi talteen.
+    <string name="permissions_rationale_msg_keys_backup_export">Element tarvitsee oikeuden tallentaakseen osapuolten välisen salauksen avaimesi talteen.
 \n
 \nSalli pääsy tiedostoihin seuraavassa ponnahdusikkunassa, jotta voit viedä avaimesi käsin.</string>
 
@@ -1881,17 +1881,17 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="login_continue">Jatka</string>
     <string name="login_connect_to">Yhdistä palvelimeen %1$s</string>
-    <string name="login_connect_to_modular">Yhdistä Modulariin</string>
+    <string name="login_connect_to_modular">Yhdistä Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Yhdistä itse määritettyyn palvelimeen</string>
     <string name="login_signin_to">Kirjaudu sisään palvelimeen %1$s</string>
     <string name="login_signup">Rekisteröidy</string>
     <string name="login_signin">Kirjaudu sisään</string>
     <string name="login_signin_sso">Jatka kertakirjautumiseen</string>
 
-    <string name="login_server_url_form_modular_hint">Modularin osoite</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services in osoite</string>
     <string name="login_server_url_form_other_hint">Osoite</string>
     <string name="login_server_url_form_modular_text">Korkealuokkaista isännöintiä organisaatioille</string>
-    <string name="login_server_url_form_modular_notice">Syötä Modular Riotin tai haluamasi palvelimen osoite</string>
+    <string name="login_server_url_form_modular_notice">Syötä Modular Elementin tai haluamasi palvelimen osoite</string>
     <string name="login_sso_error_message">Sivun lataamisessa tapahtui virhe: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Sovellus ei pysty kirjautumaan sisään tälle kotipalvelimelle. Tämä kotipalvelin tukee seuraavia kirjautumistyyppejä: %1$s.
 \n
@@ -1963,7 +1963,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 \nPeru rekisteröintiprosessi\?</string>
 
     <string name="login_a11y_choose_matrix_org">Valitse matrix.org</string>
-    <string name="login_a11y_choose_modular">Valitse modular</string>
+    <string name="login_a11y_choose_modular">Valitse Element Matrix Services</string>
     <string name="login_a11y_choose_other">Valitse muu kotipalvelin</string>
     <string name="login_a11y_captcha_container">Ratkaise seuraava kuvavarmennushaaste</string>
     <string name="login_terms_title">Hyväksy ehdot jatkaaksesi</string>
@@ -2001,13 +2001,13 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 \nKirjaudu sisään päästäksesi käsiksi tunnuksesi tietoihin ja viesteihin.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Menetät pääsyn salattuihin viesteihisi ellet kirjaudu sisään palauttaaksesi salausavaimesi.</string>
     <string name="soft_logout_clear_data_dialog_submit">Poista tiedot</string>
-    <string name="soft_logout_sso_not_same_user_error">Nykyinen istunto on käyttäjälle %1$s, ja yritit kirjautuas isään käyttäjälle %2$s. RiotX ei tue tätä.
-\nPoista ensin tietosi ja kirjaudu sen jälkeen toisella tunnuksella. Voit vaihtoehtoisesti käyttää Riotin selainversiota.</string>
+    <string name="soft_logout_sso_not_same_user_error">Nykyinen istunto on käyttäjälle %1$s, ja yritit kirjautuas isään käyttäjälle %2$s. Element ei tue tätä.
+\nPoista ensin tietosi ja kirjaudu sen jälkeen toisella tunnuksella. Voit vaihtoehtoisesti käyttää Elementin selainversiota.</string>
 
     <string name="permalink_malformed">matrix.to-linkkisi oli epämuodostunut</string>
     <string name="bug_report_error_too_short">Kuvaus on liian lyhyt</string>
 
-    <string name="login_server_url_form_other_notice">Syötä palvelin tai sen Riotin osoite, mihin haluat yhdistää</string>
+    <string name="login_server_url_form_other_notice">Syötä palvelin tai sen Elementin osoite, mihin haluat yhdistää</string>
 
     <string name="signed_out_notice">Se voi johtua monesta eri syystä:
 \n
@@ -2053,7 +2053,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="rageshake_detected">Ravistus tunnistettu!</string>
     <string name="autocomplete_limited_results">Näytetään vain ensimmäiset tulokset, kirjoita lisää kirjaimia…</string>
 
-    <string name="settings_developer_mode_fail_fast_summary">RiotX voi kaatuilla tavallista useammin odottamattomien virheiden vuoksi</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element voi kaatuilla tavallista useammin odottamattomien virheiden vuoksi</string>
 
     <string name="command_description_shrug">Lisää ¯\\_(ツ)_/¯ tavallisen viestin alkuun</string>
 
@@ -2118,9 +2118,9 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="room_member_power_level_moderator_in">Moderaattori %1$s:ssä</string>
     <string name="room_member_jump_to_read_receipt">Siirry lukukuittaukseen</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX ei osaa käsitellä tapahtumia joiden tyyppi on \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX ei osaa käsitellä viestejä joiden tyyppi on \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX ei osannut piirtää tapahtuman jonka tunniste on \'%1$s\' sisältöä</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element ei osaa käsitellä tapahtumia joiden tyyppi on \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element ei osaa käsitellä viestejä joiden tyyppi on \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element ei osannut piirtää tapahtuman jonka tunniste on \'%1$s\' sisältöä</string>
 
     <string name="room_list_sharing_header_recent_rooms">Viimeaikaiset huoneet</string>
     <string name="room_list_sharing_header_other_rooms">Muut huoneet</string>
@@ -2216,7 +2216,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Avaimet ovat jo ajan tasalla!</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Avainpyynnöt</string>
 
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 5d7599f109..fe19418efb 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -71,7 +71,7 @@
     <string name="local_address_book_header">Carnet d’adresses local</string>
     <string name="matrix_only_filter">Contacts Matrix uniquement</string>
     <string name="no_conversation_placeholder">Aucune discussion</string>
-    <string name="no_contact_access_placeholder">Vous n’avez pas autorisé Riot à accéder à vos contacts locaux</string>
+    <string name="no_contact_access_placeholder">Vous n’avez pas autorisé Element à accéder à vos contacts locaux</string>
     <string name="no_result_placeholder">Aucun résultat</string>
 
     <string name="rooms_header">Salons</string>
@@ -480,24 +480,24 @@
     <string name="call_error_user_not_responding">Le correspondant n’a pas décroché.</string>
     <string name="media_picker_both_capture_title">Prendre une photo ou une vidéo</string>
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Riot a besoin d’accéder à vos photos et vidéos pour envoyer et enregistrer des pièces jointes.
+    <string name="permissions_rationale_msg_storage">Element a besoin d’accéder à vos photos et vidéos pour envoyer et enregistrer des pièces jointes.
 
 Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir envoyer des fichiers depuis votre téléphone.</string>
-    <string name="permissions_rationale_msg_camera">Riot a besoin d’accéder à votre appareil photo pour prendre des photos et passer des appels vidéo.</string>
+    <string name="permissions_rationale_msg_camera">Element a besoin d’accéder à votre appareil photo pour prendre des photos et passer des appels vidéo.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir effectuer l’appel."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot a besoin d’accéder à votre microphone pour passer des appels audio.</string>
+    <string name="permissions_rationale_msg_record_audio">Element a besoin d’accéder à votre microphone pour passer des appels audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir effectuer l’appel."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot a besoin d’accéder à votre appareil photo et à votre microphone pour passer des appels vidéo.
+    <string name="permissions_rationale_msg_camera_and_audio">Element a besoin d’accéder à votre appareil photo et à votre microphone pour passer des appels vidéo.
 
 Veuillez autoriser l’accès dans les prochaines fenêtres contextuelles pour pouvoir effectuer l’appel.</string>
-    <string name="permissions_rationale_msg_contacts">Riot peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail. Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour découvrir les utilisateurs du carnet d’adresses joignables via Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur leur adresse e-mail et leur numéro de téléphone.
+    <string name="permissions_rationale_msg_contacts">Element peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail. Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour découvrir les utilisateurs du carnet d’adresses joignables via Element.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur leur adresse e-mail et leur numéro de téléphone.
 \n
-\nAutorisez-vous Riot à accéder à vos contacts \?</string>
+\nAutorisez-vous Element à accéder à vos contacts \?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Désolé. L’action n’a pas été réalisée, faute d’autorisations</string>
 
@@ -606,7 +606,7 @@ Attention : ce fichier peut être supprimé si l’application est désinstallé
     <string name="encryption_information_verify_device_warning2">Si elles ne correspondent pas, la sécurité de votre communication est peut-être compromise.</string>
     <string name="encryption_information_verify_key_match">Je confirme que les clés correspondent</string>
 
-    <string name="e2e_enabling_on_app_update">Riot prend désormais en charge le chiffrement de bout en bout, mais vous devez vous reconnecter pour l’activer.
+    <string name="e2e_enabling_on_app_update">Element prend désormais en charge le chiffrement de bout en bout, mais vous devez vous reconnecter pour l’activer.
 
 Vous pouvez le faire maintenant ou plus tard à partir des paramètres de l’application.</string>
 
@@ -847,7 +847,7 @@ Vous pouvez le faire maintenant ou plus tard à partir des paramètres de l’ap
     <string name="settings_notification_privacy_message_content_not_shown">• Les notifications <b>n’afficheront pas le contenu des messages</b></string>
 
     <string name="startup_notification_privacy_title">Confidentialité des notifications</string>
-    <string name="startup_notification_privacy_message">Riot peut fonctionner en arrière-plan pour gérer vos notifications de façon sécurisée et confidentielle. Cela peut affecter l’utilisation de la batterie.</string>
+    <string name="startup_notification_privacy_message">Element peut fonctionner en arrière-plan pour gérer vos notifications de façon sécurisée et confidentielle. Cela peut affecter l’utilisation de la batterie.</string>
     <string name="startup_notification_privacy_button_grant">Donner la permission</string>
     <string name="startup_notification_privacy_button_other">Choisir une autre option</string>
 
@@ -863,8 +863,8 @@ Voulez-vous en ajouter ?</string>
     <string name="settings_deactivate_my_account">Désactiver mon compte</string>
 
     <string name="settings_opt_in_of_analytics">Envoyer des données analytiques</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot collecte des données analytiques anonymes pour nous permettre d’améliorer l’application.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Veuillez autoriser la collecte des données pour nous aider à améliorer Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element collecte des données analytiques anonymes pour nous permettre d’améliorer l’application.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Veuillez autoriser la collecte des données pour nous aider à améliorer Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Oui, je veux aider !</string>
 
     <string name="widget_integration_missing_parameter">Un paramètre requis est manquant.</string>
@@ -892,7 +892,7 @@ Voulez-vous en ajouter ?</string>
     <string name="e2e_re_request_encryption_key_sent">Demande de clé envoyée.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Demande envoyée</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Veuillez lancer Riot sur un autre appareil qui peut déchiffrer le message pour qu’il puisse envoyer les clés à cette session.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Veuillez lancer Element sur un autre appareil qui peut déchiffrer le message pour qu’il puisse envoyer les clés à cette session.</string>
 
     <string name="lock_screen_hint">Tapez ici…</string>
 
@@ -1037,7 +1037,7 @@ Voulez-vous en ajouter ?</string>
     <string name="markdown_has_been_disabled">Le Markdown a été désactivé.</string>
 
     <string name="settings_call_category">Appels</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Utiliser la sonnerie par défaut de Riot pour les appels entrants</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Utiliser la sonnerie par défaut de Element pour les appels entrants</string>
     <string name="settings_call_ringtone_title">Sonnerie d’appel entrant</string>
     <string name="settings_call_ringtone_dialog_title">Sélectionner la sonnerie pour les appels :</string>
 
@@ -1070,12 +1070,12 @@ Veuillez vérifier les paramètres du compte.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Paramètres de la session.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Les notifications sont activées pour cette session.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Les notifications ne sont pas activées pour cette session.
-\nVeuillez vérifier les paramètres de Riot.</string>
+\nVeuillez vérifier les paramètres de Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Activer</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Vérification des services Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">L’APK des services Google Play est disponible et à jour.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot utilise les services Google Play pour envoyer les notifications mais ils n’ont pas l’air d’être configurés correctement :
+    <string name="settings_troubleshoot_test_play_services_failed">Element utilise les services Google Play pour envoyer les notifications mais ils n’ont pas l’air d’être configurés correctement :
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Réparer les services Google Play</string>
 
@@ -1102,25 +1102,25 @@ Essayez de redémarrer l’application.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Lancer au démarrage</string>
     <string name="settings_troubleshoot_test_service_boot_success">Le service démarrera quand l’appareil sera redémarré.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Le service ne démarrera pas quand l’appareil sera redémarré, vous ne recevrez pas de notifications tant que Riot n’aura pas été lancé au moins une fois.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Le service ne démarrera pas quand l’appareil sera redémarré, vous ne recevrez pas de notifications tant que Element n’aura pas été lancé au moins une fois.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Activer le démarrage au démarrage de l’appareil</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Vérifier les restrictions en arrière-plan</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Les restrictions en arrière-plan sont désactivées pour Riot. Ce test devrait être lancé en utilisant les données mobiles (pas le wi-fi).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Les restrictions en arrière-plan sont désactivées pour Element. Ce test devrait être lancé en utilisant les données mobiles (pas le wi-fi).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Les restrictions en arrière-plan sont activées pour Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Les restrictions en arrière-plan sont activées pour Element.
 Le travail qu’essayera de faire l’application sera restreint agressivement tant qu’elle sera en arrière-plan et cela pourra affecter les notifications.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Désactiver les restrictions</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimisation de la batterie</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot n’est pas affecté par l’optimisation de la batterie.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element n’est pas affecté par l’optimisation de la batterie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Si un utilisateur laisse un appareil débranché et immobile pour une longue durée, avec l’écran éteint, l’appareil entre dans le mode Doze. Cela empêche les applications d’accéder au réseau et reporte leurs travaux, synchronisations et alarmes standard.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorer l’optimisation</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Connexion en arrière-plan</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot doit garder une connexion à faible impact en arrière-plan afin d’avoir des notifications fiables.
-Sur l’écran suivant on vous demandera d’autoriser Riot à toujours fonctionner en arrière-plan, veuillez accepter.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element doit garder une connexion à faible impact en arrière-plan afin d’avoir des notifications fiables.
+Sur l’écran suivant on vous demandera d’autoriser Element à toujours fonctionner en arrière-plan, veuillez accepter.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Donner la permission</string>
 
     <string name="account_email_error">Une erreur est survenue lors de la vérification de votre adresse e-mail.</string>
@@ -1130,17 +1130,17 @@ Sur l’écran suivant on vous demandera d’autoriser Riot à toujours fonction
 
     <string name="no_valid_google_play_services_apk">Aucun APK des services Google Play valide n’a été trouvé. Les notifications peuvent ne pas fonctionner correctement.</string>
 
-    <string name="store_title">Riot.im - Communiquez, à votre façon</string>
+    <string name="store_title">Element - Communiquez, à votre façon</string>
     <string name="store_short_description">Une application de discussion sécurisée universelle que vous contrôlez.</string>
-    <string name="store_full_description">"Une application de discussion, que vous contrôlez et entièrement flexible. Riot vous laisse communiquer comme vous le souhaitez. Conçu pour [matrix], le standard pour les communications libres et décentralisées.
+    <string name="store_full_description">"Une application de discussion, que vous contrôlez et entièrement flexible. Element vous laisse communiquer comme vous le souhaitez. Conçu pour [matrix], le standard pour les communications libres et décentralisées.
 
 Créez un compte matrix.org gratuit, gérez votre propre serveur sur https://modular.im ou utilisez un autre serveur Matrix.
 
-Pourquoi choisir Riot.im ?
+Pourquoi choisir Element ?
 
 • COMMUNICATION COMPLÈTE : Construisez des salons autours de vos équipes, de vos amis, de votre communauté comme vous le souhaitez ! Discutez, partagez des fichiers, ajoutez des widgets et passez des appels audio et vidéo gratuitement.
 
-• INTÉGRATIONS PUISSANTES : Utilisez Riot.im avec les outils que vous connaissez déjà. Avec Riot.im vous pouvez même discuter avec les utilisateurs et les groupes qui utilisent d’autres applications de discussion.
+• INTÉGRATIONS PUISSANTES : Utilisez Element avec les outils que vous connaissez déjà. Avec Element vous pouvez même discuter avec les utilisateurs et les groupes qui utilisent d’autres applications de discussion.
 
 • PRIVÉ ET SÉCURISÉ : Gardez vos conversations secrètes. Un chiffrement de bout en bout de pointe vous garanti que vos communications privées restent privées.
 
@@ -1150,7 +1150,7 @@ Pourquoi choisir Riot.im ?
 
     <string name="video_call_in_progress">Appel vidéo en cours…</string>
 
-    <string name="store_whats_new">"Nous sommes constamment en train de modifier et d’améliorer Riot.im.
+    <string name="store_whats_new">"Nous sommes constamment en train de modifier et d’améliorer Element.
 Le journal des modifications peut être consulté ici : %1$s.
 Afin d’être sûr de ne rien manquer, continuez à installer les mises à jour."</string>
     <string name="title_activity_keys_backup_setup">Sauvegarde de clés</string>
@@ -1171,11 +1171,11 @@ Afin d’être sûr de ne rien manquer, continuez à installer les mises à jour
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Vérifier les paramètres</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Cette erreur est indépendante de Riot et, selon Google, cette erreur indique que l’appareil a enregistré trop d’applications avec FCM. Cette erreur ne survient que s’il y a un nombre d’applications extrême, et ne devrait donc pas affecter un utilisateur normal.</string>
+Cette erreur est indépendante de Element et, selon Google, cette erreur indique que l’appareil a enregistré trop d’applications avec FCM. Cette erreur ne survient que s’il y a un nombre d’applications extrême, et ne devrait donc pas affecter un utilisateur normal.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-Cette erreur est indépendante de Riot. Elle peut survenir pour plusieurs raisons. Cela peut fonctionner si vous réessayez plus tard. Vous pouvez aussi vérifier que le Service Google Play n’a pas un usage limité de données dans les paramètres système. Cela peut aussi arriver sur une ROM personnalisée.</string>
+Cette erreur est indépendante de Element. Elle peut survenir pour plusieurs raisons. Cela peut fonctionner si vous réessayez plus tard. Vous pouvez aussi vérifier que le Service Google Play n’a pas un usage limité de données dans les paramètres système. Cela peut aussi arriver sur une ROM personnalisée.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Cette erreur est indépendante de Riot. Il n’y pas de compte Google sur l’appareil. Veuillez ouvrir le gestionnaire de comptes et ajouter un compte Google.</string>
+Cette erreur est indépendante de Element. Il n’y pas de compte Google sur l’appareil. Veuillez ouvrir le gestionnaire de comptes et ajouter un compte Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Ajouter un compte</string>
 
     <string name="settings_noisy_notifications_preferences">Configurer les notifications sonores</string>
@@ -1191,7 +1191,7 @@ Cette erreur est indépendante de Riot. Il n’y pas de compte Google sur l’ap
     <string name="passphrase_empty_error_message">Veuillez saisir une phrase secrète</string>
     <string name="passphrase_passphrase_too_weak">La phrase secrète est trop faible</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Veuillez supprimer la phrase secrète si vous voulez que Riot génère une clé de récupération.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Veuillez supprimer la phrase secrète si vous voulez que Element génère une clé de récupération.</string>
     <string name="keys_backup_no_session_error">Aucune session Matrix n’est disponible</string>
 
     <string name="keys_backup_setup_step1_title">Ne perdez jamais vos messages chiffrés</string>
@@ -1354,7 +1354,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="autodiscover_invalid_response">Réponse de découverte du serveur d’accueil non valide</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Auto-compléter les options du serveur</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot a détecté une configuration de serveur personnalisée pour le domaine de votre identifiant « %1$s » :
+    <string name="autodiscover_well_known_autofill_dialog_message">Element a détecté une configuration de serveur personnalisée pour le domaine de votre identifiant « %1$s » :
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Utiliser la configuration</string>
 
@@ -1494,7 +1494,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="group_all_communities">Toutes les communautés</string>
 
     <string name="room_preview_no_preview">Impossible d’avoir un aperçu de ce salon</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">L’aperçu des salons visibles par tout le monde n’est pas encore pris en charge par RiotX</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">L’aperçu des salons visibles par tout le monde n’est pas encore pris en charge par Element</string>
 
     <string name="fab_menu_create_room">Salons</string>
     <string name="fab_menu_create_chat">Messages directs</string>
@@ -1511,7 +1511,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="keys_backup_unable_to_get_keys_backup_data">Une erreur est survenue lors de la récupération des données de sauvegarde de clés</string>
 
     <string name="alpha_disclaimer_title">Bienvenue à la bêta !</string>
-    <string name="alpha_disclaimer_content_line_1">Comme RiotX est au début de son développement, il se peut que certaines fonctionnalités soient manquantes et que vous rencontriez quelques anomalies.</string>
+    <string name="alpha_disclaimer_content_line_1">Comme Element est au début de son développement, il se peut que certaines fonctionnalités soient manquantes et que vous rencontriez quelques anomalies.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">La dernière liste de fonctionnalités est toujours dans la %1$s, et si vous rencontrez des anomalies, envoyez un rapport dans le menu en haut à gauche de l’accueil et nous les règlerons aussi vite que possible.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">description du Play Store</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Si vous rencontrez des anomalies, envoyez un rapport dans le menu en haut à gauche de l’accueil et nous les règlerons aussi vite que possible.</string>
@@ -1553,15 +1553,15 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="settings_labs_show_hidden_events_in_timeline">Afficher les évènements cachés dans les discussions</string>
 
-    <string name="store_riotx_title">RiotX − Client Matrix nouvelle génération</string>
+    <string name="store_riotx_title">Element − Client Matrix nouvelle génération</string>
     <string name="store_riotx_short_description">Un client pour Matrix plus rapide et plus léger utilisant les derniers frameworks Android</string>
-    <string name="store_riotx_full_description">RiotX est un nouveau client pour le protocole Matrix (Matrix.org) : un réseau ouvert pour des communications sécurisées et décentralisées. RiotX est une réécriture complète du client Android Riot, basée sur une réécriture complète du SDK Android de Matrix.
+    <string name="store_riotx_full_description">Element est un nouveau client pour le protocole Matrix (Matrix.org) : un réseau ouvert pour des communications sécurisées et décentralisées. Element est une réécriture complète du client Android Riot, basée sur une réécriture complète du SDK Android de Matrix.
 \n
-\nMise en garde : Ceci est une version bêta. RiotX est actuellement en plein développement et a des limites et (peu, nous l’espérons) des anomalies. Tout commentaire est le bienvenu !
+\nMise en garde : Ceci est une version bêta. Element est actuellement en plein développement et a des limites et (peu, nous l’espérons) des anomalies. Tout commentaire est le bienvenu !
 \n
-\nRiotX prend en charge : • Se connecter à un compte existant • Créer de salons et rejoindre des salons publics • Accepter et refuser des invitations • Lister les salons des utilisateurs • Voir les informations des salons • Envoyer des messages texte • Envoyer des pièces jointes • Lire et écrire des messages dans les salons chiffrés • Chiffrement : sauvegarde des clés de chiffrement, vérification avancée des appareils, demande et réponse de partage de clé • Notifications • Thèmes clair, sombre et noir
+\nElement prend en charge : • Se connecter à un compte existant • Créer de salons et rejoindre des salons publics • Accepter et refuser des invitations • Lister les salons des utilisateurs • Voir les informations des salons • Envoyer des messages texte • Envoyer des pièces jointes • Lire et écrire des messages dans les salons chiffrés • Chiffrement : sauvegarde des clés de chiffrement, vérification avancée des appareils, demande et réponse de partage de clé • Notifications • Thèmes clair, sombre et noir
 \n
-\nToutes les fonctionnalités de Riot ne sont pas encore implémentées dans RiotX. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Réglages des salons (lister les membres du salon etc.) • Appels • Widgets • …</string>
+\nToutes les fonctionnalités de Element ne sont pas encore implémentées dans Element. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Réglages des salons (lister les membres du salon etc.) • Appels • Widgets • …</string>
 
     <string name="bottom_action_people_x">Messages directs</string>
 
@@ -1613,7 +1613,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="widget_integration_review_terms">Pour continuer, vous devez accepter les conditions de ce service.</string>
 
-    <string name="security_warning_identity_server">Les versions précédentes de Riot avaient un problème de sécurité qui pouvait permettre à votre serveur d’identité (%1$s) d’accéder à votre compte. Si vous faites confiance à %2$s, vous pouvez ignorer cela ; sinon déconnectez-vous et reconnectez-vous.
+    <string name="security_warning_identity_server">Les versions précédentes de Element avaient un problème de sécurité qui pouvait permettre à votre serveur d’identité (%1$s) d’accéder à votre compte. Si vous faites confiance à %2$s, vous pouvez ignorer cela ; sinon déconnectez-vous et reconnectez-vous.
 \n
 \nVous trouverez plus de détails ici :
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1647,11 +1647,11 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="invite_no_identity_server_error">Ajoutez un serveur d’identité dans vos paramètres pour réaliser cette action.</string>
     <string name="settings_background_fdroid_sync_mode">Mode de synchronisation en arrière-plan (expérimental)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimisé pour la batterie</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot se synchronisera en arrière-plan de façon à préserver les ressources limitées de l’appareil (batterie).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element se synchronisera en arrière-plan de façon à préserver les ressources limitées de l’appareil (batterie).
 \nSelon l’état des ressources de votre appareil, la synchronisation peut être retardée par le système d’exploitation.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimisé pour le temps réel</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot se synchronisera en arrière-plan de façon périodique à un moment précis (configurable).
-\nCela aura un impact sur l’utilisation de la radio et de la batterie, une notification permanente sera affichée indiquant que Riot est à l’écoute des évènements.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element se synchronisera en arrière-plan de façon périodique à un moment précis (configurable).
+\nCela aura un impact sur l’utilisation de la radio et de la batterie, une notification permanente sera affichée indiquant que Element est à l’écoute des évènements.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Aucune synchronisation en arrière-plan</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Vous ne serez pas notifié(e) des messages entrants quand l’application est en arrière-plan.</string>
     <string name="settings_background_sync_update_error">Échec de la mise à jour des paramètres.</string>
@@ -1755,14 +1755,14 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 \n
 \nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez le bloquer pour masquer ses messages</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot a besoin de votre permission pour sauvegarder vos clés de chiffrement sur le disque.
+    <string name="permissions_rationale_msg_keys_backup_export">Element a besoin de votre permission pour sauvegarder vos clés de chiffrement sur le disque.
 \n
 \nAutorisez l’accès dans le prochaine fenêtre pour pouvoir exporter vos clés manuellement.</string>
 
     <string name="no_network_indicator">Il n’y a aucune connexion au réseau pour le moment</string>
 
     <string name="settings_add_3pid_confirm_password_title">Confirmez votre mot de passe</string>
-    <string name="settings_add_3pid_flow_not_supported">Vous ne pouvez pas faire cela depuis Riot mobile</string>
+    <string name="settings_add_3pid_flow_not_supported">Vous ne pouvez pas faire cela depuis Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">Une authentification est nécessaire</string>
 
 
@@ -1835,18 +1835,18 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="login_continue">Continuer</string>
     <string name="login_connect_to">Se connecter à %1$s</string>
-    <string name="login_connect_to_modular">Se connecter à Modular</string>
+    <string name="login_connect_to_modular">Se connecter à Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Se connecter à un serveur personnalisé</string>
     <string name="login_signin_to">S’authentifier sur %1$s</string>
     <string name="login_signup">S’inscrire</string>
     <string name="login_signin">S’authentifier</string>
     <string name="login_signin_sso">Continuer avec l’authentification unique</string>
 
-    <string name="login_server_url_form_modular_hint">Adresse Modular</string>
+    <string name="login_server_url_form_modular_hint">Adresse Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Adresse</string>
     <string name="login_server_url_form_modular_text">Hébergement privé pour les organisations</string>
-    <string name="login_server_url_form_modular_notice">Saisir l’adresse de Riot ou du serveur de Modular que vous voulez utiliser</string>
-    <string name="login_server_url_form_other_notice">Saisir l’adresse d’un serveur ou d’un Riot auquel vous voulez vous connecter</string>
+    <string name="login_server_url_form_modular_notice">Saisir l’adresse de Element ou du serveur de Modular que vous voulez utiliser</string>
+    <string name="login_server_url_form_other_notice">Saisir l’adresse d’un serveur ou d’un Element auquel vous voulez vous connecter</string>
 
     <string name="login_sso_error_message">Une erreur est survenue pendant le chargement de la page : %1$s (%2$d)</string>
     <string name="login_mode_not_supported">L’application ne peut pas s’authentifier sur ce serveur d’accueil. Le serveur d’accueil prend en charge le(s) type(s) d’authentification suivant(s) : %1$s.
@@ -1919,7 +1919,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 \nArrêter le processus de création \?</string>
 
     <string name="login_a11y_choose_matrix_org">Sélectionner matrix.org</string>
-    <string name="login_a11y_choose_modular">Sélectionner Modular</string>
+    <string name="login_a11y_choose_modular">Sélectionner Element Matrix Services</string>
     <string name="login_a11y_choose_other">Sélectionner un serveur d’accueil personnalisé</string>
     <string name="login_a11y_captcha_container">Veuillez compléter le captcha</string>
     <string name="login_terms_title">Acceptez les termes pour continuer</string>
@@ -1965,7 +1965,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 \nReconnectez-vous pour accéder aux données et aux messages de votre compte.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Vous perdrez l’accès à vos messages sécurisés sauf si vous vous connectez pour récupérer vos clés de chiffrement.</string>
     <string name="soft_logout_clear_data_dialog_submit">Effacer les données</string>
-    <string name="soft_logout_sso_not_same_user_error">La session en cours est celle de l’utilisateur %1$s et vous fournissez des identifiants pour l’utilisateur %2$s. Ce n’est pas pris en charge par RiotX.
+    <string name="soft_logout_sso_not_same_user_error">La session en cours est celle de l’utilisateur %1$s et vous fournissez des identifiants pour l’utilisateur %2$s. Ce n’est pas pris en charge par Element.
 \nEffacez d’abord les données, puis reconnectez-vous avec un autre compte.</string>
 
     <string name="permalink_malformed">Votre lien matrix.to était malformé</string>
@@ -1988,7 +1988,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="autocomplete_limited_results">Seuls les premiers résultats sont affichés, saisissez plus de lettres…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Défaillance rapide</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX peut planter plus souvent quand une erreur inattendue survient</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element peut planter plus souvent quand une erreur inattendue survient</string>
     <string name="command_description_verify">Demande de vérification de l’identifiant utilisateur fourni</string>
     <string name="command_description_shrug">Préfixe ¯\\_(ツ)_/¯ à un message en texte brut</string>
 
@@ -2078,9 +2078,9 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="room_member_jump_to_read_receipt">Aller à l’accusé de lecture</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX ne gère pas les évènements de type « %1$s »</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX ne gère pas les messages de type « %1$s »</string>
-    <string name="rendering_event_error_exception">RiotX a rencontré un problème lors de l’affichage du contenu de l’évènement ayant pour identifiant « %1$s »</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element ne gère pas les évènements de type « %1$s »</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element ne gère pas les messages de type « %1$s »</string>
+    <string name="rendering_event_error_exception">Element a rencontré un problème lors de l’affichage du contenu de l’évènement ayant pour identifiant « %1$s »</string>
 
     <string name="unignore">Ne plus ignorer</string>
 
@@ -2210,7 +2210,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Les clés sont déjà à jour !</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Demandes de clé</string>
 
@@ -2349,13 +2349,13 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="error_adding_media_file_to_gallery">Impossible d’ajouter le fichier multimédia à la galerie</string>
     <string name="change_password_summary">Définir un nouveau mot de passe de compte…</string>
 
-    <string name="use_other_session_content_description">Utilisez la dernière version de Riot sur vos autres appareils : Riot Web, Riot pour Bureau, Riot iOS, RiotX pour Android, ou un autre client Matrix qui prend en charge la signature croisée</string>
-    <string name="riot_desktop_web">Riot Web
-\nRiot pour Bureau</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X pour Android</string>
+    <string name="use_other_session_content_description">Utilisez la dernière version de Element sur vos autres appareils : Element Web, Element pour Bureau, Element iOS, Element pour Android, ou un autre client Matrix qui prend en charge la signature croisée</string>
+    <string name="riot_desktop_web">Element Web
+\nElement pour Bureau</string>
+    <string name="riot_ios_android">Element iOS
+\nElement pour Android</string>
     <string name="or_other_mx_capabale_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
-    <string name="use_latest_riot">Utilisez la dernière version de Riot sur vos autres appareils :</string>
+    <string name="use_latest_riot">Utilisez la dernière version de Element sur vos autres appareils :</string>
     <string name="command_description_discard_session">Force la session de groupe sortante actuelle dans un salon chiffré à être abandonnée</string>
     <string name="command_description_discard_session_not_handled">Seulement pris en charge dans les salons chiffrés</string>
     <string name="enter_secret_storage_passphrase_or_key">Utilisez votre %1$s ou votre %2$s pour continuer.</string>
@@ -2427,11 +2427,11 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="open_terms_of">Ouvrir les termes de %s</string>
     <string name="disconnect_identity_server_dialog_content">Se déconnecter du serveur d’identité %s \?</string>
-    <string name="identity_server_error_outdated_identity_server">Ce serveur d’identité est obsolète. RiotX ne supporte que l’API V2.</string>
+    <string name="identity_server_error_outdated_identity_server">Ce serveur d’identité est obsolète. Element ne supporte que l’API V2.</string>
     <string name="identity_server_error_outdated_home_server">Cette opération n’est pas possible. Le serveur d’accueil est obsolète.</string>
     <string name="identity_server_error_no_identity_server_configured">Veuillez d’abord configurer un serveur d’identité.</string>
     <string name="identity_server_error_terms_not_signed">Veuillez d’abord accepter les termes du serveur d’identité dans les paramètres.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, RiotX prend uniquement en charge l’envoi des adresses e-mail et des numéros de téléphone hachés.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, Element prend uniquement en charge l’envoi des adresses e-mail et des numéros de téléphone hachés.</string>
     <string name="identity_server_error_binding_error">L’association a échoué.</string>
     <string name="identity_server_error_no_current_binding_error">Il n’y a actuellement aucune association avec cet identifiant.</string>
 
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index 87e1b59509..b0999ff8e7 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -133,7 +133,7 @@
     <string name="user_directory_header">Brûkerskatalogus</string>
     <string name="matrix_only_filter">Allinnich Matrix-kontakten</string>
     <string name="no_conversation_placeholder">Gjin petearen</string>
-    <string name="no_contact_access_placeholder">Jo hawwe Riot gjin tagong ta jo lokale kontakten jûn</string>
+    <string name="no_contact_access_placeholder">Jo hawwe Element gjin tagong ta jo lokale kontakten jûn</string>
     <string name="no_result_placeholder">Gjin resultaten</string>
     <string name="people_no_identity_server">Gjin identiteitsserver konfigurearre.</string>
 
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index aa70225f69..c0a85a67d1 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -92,7 +92,7 @@
     <string name="user_directory_header">Directorio de usuario</string>
     <string name="matrix_only_filter">Só contactos Matrix</string>
     <string name="no_conversation_placeholder">Sen conversas</string>
-    <string name="no_contact_access_placeholder">"Non lle permitiu acceder aos contactos locais a Riot "</string>
+    <string name="no_contact_access_placeholder">"Non lle permitiu acceder aos contactos locais a Element "</string>
     <string name="no_result_placeholder">Sen resultados</string>
 
     <string name="rooms_header">Salas</string>
@@ -305,7 +305,7 @@ Pode engadir a dirección de correo na sección de configuración de perfil.</st
 
     <string name="settings_analytics">Analytics</string>
     <string name="settings_opt_in_of_analytics">Enviar datos de análises</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot recolle información analítica anónima para permitirnos mellorar o aplicativo.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element recolle información analítica anónima para permitirnos mellorar o aplicativo.</string>
     <string name="settings_opt_in_of_analytics_ok">Si, quero axuda</string>
 
     <string name="devices_details_id_title">ID</string>
@@ -550,7 +550,7 @@ Pode engadir a dirección de correo na sección de configuración de perfil.</st
     <string name="e2e_re_request_encryption_key"><u>Volver a pedir as chaves de cifrado</u> do outro dispositivo seu.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Petición enviada</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Inicie Riot noutro dispositivo que poida descifrar esta mensaxe e que despois desde alí lle poida enviar as chaves a este dispositivo.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Inicie Element noutro dispositivo que poida descifrar esta mensaxe e que despois desde alí lle poida enviar as chaves a este dispositivo.</string>
 
     <plurals name="membership_changes">
         <item quantity="one">1 cambio de membros</item>
@@ -653,7 +653,7 @@ Seguramente queira conectarse cunha conta distinta, ou engadir este correo a sú
     <string name="settings_notifications_targets">Obxectivos das notificacións</string>
     <string name="settings_deactivate_account_section">Desactivar conta</string>
     <string name="startup_notification_privacy_title">Segredo das notificacións</string>
-    <string name="startup_notification_privacy_message">Riot pode estar agochado e seguir traballando na xestión das notificacións dun xeito seguro e privado (inda que iso podería afectar ao uso da batería).</string>
+    <string name="startup_notification_privacy_message">Element pode estar agochado e seguir traballando na xestión das notificacións dun xeito seguro e privado (inda que iso podería afectar ao uso da batería).</string>
     <string name="startup_notification_privacy_button_grant">Outorgar permisos</string>
     <string name="startup_notification_privacy_button_other">Escolla outra opción</string>
 
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index 957d2ba70b..955d3bc8d1 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -133,7 +133,7 @@
     <string name="user_directory_header">Popis korisnika</string>
     <string name="matrix_only_filter">Samo kontakti u Matrixu</string>
     <string name="no_conversation_placeholder">Nema razgovora</string>
-    <string name="no_contact_access_placeholder">Niste Riotu omogućili pristup Vašim lokalnim kontaktima</string>
+    <string name="no_contact_access_placeholder">Niste Elementu omogućili pristup Vašim lokalnim kontaktima</string>
     <string name="no_result_placeholder">Nema rezultata</string>
     <string name="people_no_identity_server">Nije podešen poslužitelj identiteta.</string>
 
@@ -288,7 +288,7 @@
     <string name="e2e_re_request_encryption_key_sent">Zahtjev za ključ je poslan.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Zahtjev poslan</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Pokrenite Riot na nekom drugom uređaju koji može dešifrirati poruku kako bi poslao ključeve ovoj sesiji.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Pokrenite Element na nekom drugom uređaju koji može dešifrirati poruku kako bi poslao ključeve ovoj sesiji.</string>
 
     <string name="read_receipts_list">Popis potvrda o pročitanim porukama</string>
 
@@ -318,7 +318,7 @@
     <string name="room_info_room_topic">Tema sobe</string>
 
     <string name="settings_call_category">Pozivi</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Koristi zadan zvuk tona Riota za dolazne pozive</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Koristi zadan zvuk tona Elementa za dolazne pozive</string>
     <string name="settings_call_ringtone_use_default_stun">Dozvoli rezervnog poslužitelja za pozivnog pomoćnika</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Koristit će se %s kao pomoćnik u slučaju da ga Vaš poslužitelj nema (Vaša IP adresa će biti podijeljena tijekom poziva)</string>
     <string name="settings_call_ringtone_title">Zvuk tona dolaznog poziva</string>
@@ -344,22 +344,22 @@
     <string name="media_picker_cannot_record_video">Nije moguće snimiti video zapis</string>
 
     <string name="permissions_rationale_popup_title">Informacije</string>
-    <string name="permissions_rationale_msg_storage">Riot treba dozvolu pristupa Vašoj kolekciji fotografija i video zapisa za slanje i spremanje privitaka.
+    <string name="permissions_rationale_msg_storage">Element treba dozvolu pristupa Vašoj kolekciji fotografija i video zapisa za slanje i spremanje privitaka.
 \n
 \nOmogućite pristup putem sljedećeg skočnog prozora kako biste mogli slati datoteke s Vašeg uređaja.</string>
-    <string name="permissions_rationale_msg_camera">Riot treba dozvolu pristupa Vašoj kameri za snimanje fotografija i za video pozive.</string>
+    <string name="permissions_rationale_msg_camera">Element treba dozvolu pristupa Vašoj kameri za snimanje fotografija i za video pozive.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nOmogućite pristup putem sljedećeg skočnog prozora kako biste mogli uspostaviti poziv."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot treba dozvolu pristupa Vašem mikrofonu za obavljanje zvučnih poziva.</string>
+    <string name="permissions_rationale_msg_record_audio">Element treba dozvolu pristupa Vašem mikrofonu za obavljanje zvučnih poziva.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nOmogućite pristup putem sljedećeg skočnog prozora kako biste mogli uspostaviti poziv."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot treba dozvolu pristupa Vašoj kameri i mikrofonu za obavljanje video poziva.
+    <string name="permissions_rationale_msg_camera_and_audio">Element treba dozvolu pristupa Vašoj kameri i mikrofonu za obavljanje video poziva.
 \n
 \nOmogućite pristup putem sljedećih skočnih prozora kako biste mogli uspostaviti poziv.</string>
-    <string name="permissions_rationale_msg_contacts">Riot može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva. Ako se slažete podijeliti imenik u ove svrhe, dozvolite pristup putem sljedećeg skočnog prozora.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva.
+    <string name="permissions_rationale_msg_contacts">Element može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva. Ako se slažete podijeliti imenik u ove svrhe, dozvolite pristup putem sljedećeg skočnog prozora.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva.
 \n
 \nŽelite li podijeliti imenik u ove svrhe\?</string>
 
@@ -590,7 +590,7 @@
 
     <string name="room_settings_de_prioritize">Smanji prioritet</string>
     <string name="settings_add_3pid_confirm_password_title">Potvrdite Vašu lozinku</string>
-    <string name="settings_add_3pid_flow_not_supported">Ovo nije moguće napraviti iz mobilne inačice Riota</string>
+    <string name="settings_add_3pid_flow_not_supported">Ovo nije moguće napraviti iz mobilne inačice Elementa</string>
     <string name="settings_add_3pid_authentication_needed">Potrebna je ovjera</string>
 
 
@@ -622,7 +622,7 @@
     <string name="settings_troubleshoot_test_device_settings_title">Postavke sesije.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Obavijesti su uključene za ovu sesiju.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Obavijesti su isključene za ovu sesiju.
-\nProvjerite postavke Riota.</string>
+\nProvjerite postavke Elementa.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Uključi</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Prilagođene postavke.</string>
@@ -633,7 +633,7 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Provjera Usluga za Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Usluga za Google Play je dostupan i ažuriran.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot koristi Usluge za Google Play kako bi isporučio poruke, no čini se da nisu ispravno podešene.
+    <string name="settings_troubleshoot_test_play_services_failed">Element koristi Usluge za Google Play kako bi isporučio poruke, no čini se da nisu ispravno podešene.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Popravi Usluge za Play</string>
 
@@ -643,11 +643,11 @@
     <string name="settings_troubleshoot_test_fcm_failed">Neuspješno dohvaćanje oznake FCM-a:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nRiot nema kontrolu nad ovom greškom te prema Googleu ova greška ukazuje da uređaj ima previše prijavljenih aplikacija na FCM-u. Greška se pojavljuje samo u slučajevima u kojima postoji krajnje mnogo aplikacija te to ne bi trebao biti slučaj kod prosječnog korisnika.</string>
+\nElement nema kontrolu nad ovom greškom te prema Googleu ova greška ukazuje da uređaj ima previše prijavljenih aplikacija na FCM-u. Greška se pojavljuje samo u slučajevima u kojima postoji krajnje mnogo aplikacija te to ne bi trebao biti slučaj kod prosječnog korisnika.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nRiot nema kontrolu nad ovom greškom. Nekoliko je mogućih razloga za grešku. Možda će raditi ako kasnije ponovno pokušate. Također u postavkama sustava možete provjeriti da Usluge za Google Play nisu ograničene u korištenju podatkovnog prometa i da je sat Vašeg uređaja točan. Greška je moguća i na prilagođenim ROM-ovima.</string>
+\nElement nema kontrolu nad ovom greškom. Nekoliko je mogućih razloga za grešku. Možda će raditi ako kasnije ponovno pokušate. Također u postavkama sustava možete provjeriti da Usluge za Google Play nisu ograničene u korištenju podatkovnog prometa i da je sat Vašeg uređaja točan. Greška je moguća i na prilagođenim ROM-ovima.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nRiot nema kontrolu nad ovom greškom. Na uređaju ne postoji račun pri Googleu. Možete otvoriti upravitelja računima i dodati račun pri Googleu.</string>
+\nElement nema kontrolu nad ovom greškom. Na uređaju ne postoji račun pri Googleu. Možete otvoriti upravitelja računima i dodati račun pri Googleu.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Dodaj račun</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Registracija oznake</string>
@@ -667,19 +667,19 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Pokreni pri podizanju sustava</string>
     <string name="settings_troubleshoot_test_service_boot_success">Servis će se pokrenuti prilikom ponovnog pokretanja uređaja.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Servis se neće pokrenuti sa ponovnim pokretanjem uređaja pa nećete primati obavijesti sve dok ne otvorite Riot.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Servis se neće pokrenuti sa ponovnim pokretanjem uređaja pa nećete primati obavijesti sve dok ne otvorite Element.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Omogući pokretanje pri podizanju sustava</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Provjeri pozadinska ograničenja</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Pozadinska su ograničenja onemogućena za Riot. Ovaj test trebate izvršiti putem podatkovne veze (bez WIFI-ja).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Pozadinska su ograničenja onemogućena za Element. Ovaj test trebate izvršiti putem podatkovne veze (bez WIFI-ja).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Pozadinska su ograničenja omogućena za Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Pozadinska su ograničenja omogućena za Element.
 \nRadnje koje aplikacija pokušava napraviti su bitno ograničene dok je u pozadini i ovo možete utjecati na obavijesti.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Onemogući ograničenja</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimiranje baterije</string>
-    <string name="settings_troubleshoot_test_battery_success">Optimiranje baterije ne utječe na Riot.</string>
+    <string name="settings_troubleshoot_test_battery_success">Optimiranje baterije ne utječe na Element.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ako korisnik uz ugašen zaslon ostavi uređaj nepriključenog i u mirovanju tijekom nekog vremena, uređaj će ući u način drijemanja. Ovo aplikacijama onemogućuje pristup mreži i odgađa njihove zadatke, sinkronizaciju i uobičajene alarme.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Zanemari optimiranje</string>
 
@@ -714,11 +714,11 @@
     <string name="settings_background_sync">Pozadinska sinkronizacija</string>
     <string name="settings_background_fdroid_sync_mode">Način pozadinske sinkronizacije (eksperimentalno)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimirano za bateriju</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot će sinkronizirati u pozadini na način koji čuva ograničena sredstva uređaja (baterija).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element će sinkronizirati u pozadini na način koji čuva ograničena sredstva uređaja (baterija).
 \nOvisno o stanju sredstava uređaja, operacijski sustav može odgoditi sinkronizaciju.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimirano za stvarno vrijeme</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot će u pozadini i periodično u točno određeno vrijeme koje je podesivo vršiti sinkronizaciju.
-\nOvo će imati utjecaja na korištenje radijskog sustava i potrošnju baterije. Uočit ćete stalno prikazanu obavijest da Riot osluškuje događaje.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element će u pozadini i periodično u točno određeno vrijeme koje je podesivo vršiti sinkronizaciju.
+\nOvo će imati utjecaja na korištenje radijskog sustava i potrošnju baterije. Uočit ćete stalno prikazanu obavijest da Element osluškuje događaje.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Bez pozadinske sinkronizacije</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nećete primati obavijesti o dolaznim porukama kada je aplikacija u pozadini.</string>
     <string name="settings_background_sync_update_error">Neuspjela promjena postavki.</string>
@@ -784,19 +784,19 @@
     <string name="settings_discovery_category">Pronalaženje</string>
     <string name="settings_discovery_manage">Upravljajte Vašim postavkama za pronalaženje.</string>
     <string name="startup_notification_privacy_title">Privatnost obavještavanja</string>
-    <string name="startup_notification_privacy_message">Riot se može izvršavati u pozadini kako bi sigurno i privatno upravljao Vašim obavijestima. Ovo može utjecati na potrošnju baterije.</string>
+    <string name="startup_notification_privacy_message">Element se može izvršavati u pozadini kako bi sigurno i privatno upravljao Vašim obavijestima. Ovo može utjecati na potrošnju baterije.</string>
     <string name="startup_notification_privacy_button_grant">Dozvoli</string>
     <string name="startup_notification_privacy_button_other">Izaberi drugu opciju</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Pozadinska veza</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot treba održati pozadinsku vezu s malim utjecajem kako bi imao pouzdane obavijesti.
-\nNa sljedećem zaslonu potvrdite Riotov zahtjev za stalnim izvršavanjem u pozadini.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element treba održati pozadinsku vezu s malim utjecajem kako bi imao pouzdane obavijesti.
+\nNa sljedećem zaslonu potvrdite Elementov zahtjev za stalnim izvršavanjem u pozadini.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Dozvoli</string>
 
     <string name="settings_analytics">Analitika</string>
     <string name="settings_opt_in_of_analytics">Pošalji analitičke podatke</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot skuplja anonimnu analitiku kako bi se unaprijedila aplikacija.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Omogućite analitiku ako želite pomoći unaprijediti Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element skuplja anonimnu analitiku kako bi se unaprijedila aplikacija.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Omogućite analitiku ako želite pomoći unaprijediti Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Da, želim pomoći!</string>
 
     <string name="settings_data_save_mode">Način uštede podataka</string>
@@ -1046,8 +1046,8 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Nije pronađen valjajući APK Usluga za Google Play. Moguće je da obavijesti neće ispravno raditi.</string>
 
-    <string name="store_title">Riot.im - Komunicirajte onako kako Vama odgovara</string>
-    <string name="store_whats_new">Stalno radimo na izmjenama i poboljšanjima Riot.im-a. Cjelovit dnevnik izmjena je moguće pronaći u %1$s. Kako biste ostali informirani o novostima, imajte omogućeno ažuriranje.</string>
+    <string name="store_title">Element - Komunicirajte onako kako Vama odgovara</string>
+    <string name="store_whats_new">Stalno radimo na izmjenama i poboljšanjima Element-a. Cjelovit dnevnik izmjena je moguće pronaći u %1$s. Kako biste ostali informirani o novostima, imajte omogućeno ažuriranje.</string>
     <string name="store_short_description">Univerzalna aplikacija za sigurno ćaskanje pod Vašom kontrolom.</string>
     <string name="passphrase_create_passphrase">Napravi fraza-lozinku</string>
     <string name="passphrase_confirm_passphrase">Potvrdi fraza-lozinku</string>
@@ -1056,7 +1056,7 @@
     <string name="passphrase_empty_error_message">Unesite fraza-lozinku</string>
     <string name="passphrase_passphrase_too_weak">Fraza-lozinka je preslaba</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Izbrišite fraza-lozinku ako želite da Riot generira ključ za obnovu.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Izbrišite fraza-lozinku ako želite da Element generira ključ za obnovu.</string>
     <string name="sas_incoming_request_notif_title">Zahtjev za potvrdom</string>
     <string name="sas_incoming_request_notif_content">%s želi potvrditi Vašu sesiju</string>
 
@@ -1075,7 +1075,7 @@
     <string name="identity_server_not_defined">Ne koristite poslužitelja identiteta</string>
     <string name="identity_server_not_defined_for_password_reset">Nije podešen poslužitelj identiteta. Potreban je za poništavanje Vaše lozinke.</string>
 
-    <string name="security_warning_identity_server">Prijašnje inačice Riota imale su sigurnosni propust koji bi Vašem poslužitelju identiteta (%1$s) omogućio pristup Vašem računu. Ako vjerujete %2$s, možete ovo zanemariti. U suprotnom se odjavite i ponovno prijavite.
+    <string name="security_warning_identity_server">Prijašnje inačice Elementa imale su sigurnosni propust koji bi Vašem poslužitelju identiteta (%1$s) omogućio pristup Vašem računu. Ako vjerujete %2$s, možete ovo zanemariti. U suprotnom se odjavite i ponovno prijavite.
 \n
 \nOvdje možete pronaći više informacija:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1120,7 +1120,7 @@
     <string name="group_all_communities">Sve zajednice</string>
 
     <string name="room_preview_no_preview">Nije moguće pregledati sobu</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Pregled sobe u koju svatko ima uvid još nije podržan u RiotX-u</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Pregled sobe u koju svatko ima uvid još nije podržan u Element-u</string>
 
     <string name="fab_menu_create_room">Sobe</string>
     <string name="fab_menu_create_chat">Izravne poruke</string>
@@ -1322,7 +1322,7 @@
     <string name="encryption_information_verify_device_warning2">Ako se ne podudaraju, sigurnost Vaše komunikacije može biti narušena.</string>
     <string name="encryption_information_verify_key_match">Potvrđujem da ključevi odgovaraju</string>
 
-    <string name="e2e_enabling_on_app_update">Riot podržava šifriranje s kraja na kraj, no trebat ćete se ponovno prijaviti kako biste ga omogućili.
+    <string name="e2e_enabling_on_app_update">Element podržava šifriranje s kraja na kraj, no trebat ćete se ponovno prijaviti kako biste ga omogućili.
 \n
 \nTo možete sada učiniti ili kasnije iz postavki aplikacije.</string>
 
@@ -1464,18 +1464,18 @@
 
     <string name="login_continue">Nastavi</string>
     <string name="login_connect_to">Spoji se na %1$s</string>
-    <string name="login_connect_to_modular">Spoji se na Modular</string>
+    <string name="login_connect_to_modular">Spoji se na Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Spoji se na prilagođenog poslužitelja</string>
     <string name="login_signin_to">Prijavi se na %1$s</string>
     <string name="login_signup">Otvori račun</string>
     <string name="login_signin">Prijavi se</string>
     <string name="login_signin_sso">Nastavi sa SSO-om</string>
 
-    <string name="login_server_url_form_modular_hint">Adresa u Modularu</string>
+    <string name="login_server_url_form_modular_hint">Adresa u Element Matrix Services u</string>
     <string name="login_server_url_form_other_hint">Adresa</string>
     <string name="login_server_url_form_modular_text">Plaćeno gošćenje za organizacije</string>
-    <string name="login_server_url_form_modular_notice">Unesite adresu Modular Riota ili poslužitelja koji želite koristiti</string>
-    <string name="login_server_url_form_other_notice">Unesite adresu poslužitelja ili Riota na koji se želite spojiti</string>
+    <string name="login_server_url_form_modular_notice">Unesite adresu Modular Elementa ili poslužitelja koji želite koristiti</string>
+    <string name="login_server_url_form_other_notice">Unesite adresu poslužitelja ili Elementa na koji se želite spojiti</string>
 
     <string name="login_sso_error_message">Došlo je do greške pri učitavanju stranice: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikacija se ne može prijaviti na ovog poslužitelja. Poslužitelj podržava sljedeće vrste prijava: %1$s.
@@ -1554,9 +1554,9 @@
 
     <string name="room_member_jump_to_read_receipt">Skoči na potvrdu o pročitanoj poruci</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX ne podržava događaje tipa \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX ne podržava poruke tipa \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX je naišao na problem pri prikazu sadržaja događaja s identitetom \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element ne podržava događaje tipa \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element ne podržava poruke tipa \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element je naišao na problem pri prikazu sadržaja događaja s identitetom \'%1$s\'</string>
 
     <string name="unignore">Ukloni zanemarivanje</string>
 
@@ -1618,7 +1618,7 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">Došlo je do greške pri dohvaćanju podataka iz sigurnosne kopije ključeva</string>
 
     <string name="alpha_disclaimer_title">Dobrodošli u radnu inačicu!</string>
-    <string name="alpha_disclaimer_content_line_1">Obzirom da je RiotX u fazi ranog razvoja, neke značajke mogu nedostajati i moguće su greške u aplikaciji.</string>
+    <string name="alpha_disclaimer_content_line_1">Obzirom da je Element u fazi ranog razvoja, neke značajke mogu nedostajati i moguće su greške u aplikaciji.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">Najnoviji popis značajki se uvijek nalazi na %1$s. Ako nađete greške u aplikaciji, budite ljubazni pa pošaljite izvještaj pomoću izbornika u gornje-lijevom kutu Početne stranice. Razvijatelji će ispraviti greške čim prije.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Opis za trgovinu Play</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Ako nađete greške u aplikaciji, budite ljubazni pa pošaljite izvještaj pomoću izbornika u gornje-lijevom kutu Početne stranice. Razvijatelji će ispraviti greške čim prije.</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 80830ac3d6..9c5702a38f 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -74,7 +74,7 @@
     <string name="local_address_book_header">Helyi címjegyzék</string>
     <string name="matrix_only_filter">Csak Matrix névjegyek</string>
     <string name="no_conversation_placeholder">Nincsenek beszélgetések</string>
-    <string name="no_contact_access_placeholder">Nem adtál hozzáférést a Riotnak a helyi névjegyeidhez</string>
+    <string name="no_contact_access_placeholder">Nem adtál hozzáférést a Elementnak a helyi névjegyeidhez</string>
     <string name="no_result_placeholder">Nincs találat</string>
 
     <string name="rooms_header">Szobák</string>
@@ -220,22 +220,22 @@ Az e-mail címed a beállításoknál adhatod a profilodhoz.</string>
     <string name="media_picker_cannot_record_video">Videórögzítés sikertelen</string>
 
     <string name="permissions_rationale_popup_title">Információ</string>
-    <string name="permissions_rationale_msg_storage">A Riot-nak szüksége van a fotó és videó könyvtáradnak elérési engedélyéhez a csatolmányok küldéséhez.
+    <string name="permissions_rationale_msg_storage">A Element-nak szüksége van a fotó és videó könyvtáradnak elérési engedélyéhez a csatolmányok küldéséhez.
 \n
 \nKérlek engedélyezd a hozzáférést a következő felugró ablakban, hogy tudj fájlokat küldeni a telefonodról.</string>
-    <string name="permissions_rationale_msg_camera">Riot-nak engedély szükséges a kamerád eléréséhez, hogy tudj képeket készíteni és videó hívásokat.</string>
+    <string name="permissions_rationale_msg_camera">Element-nak engedély szükséges a kamerád eléréséhez, hogy tudj képeket készíteni és videó hívásokat.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani."</string>
-    <string name="permissions_rationale_msg_record_audio">A Riot-nak engedély szükséges a mikrofonod eléréséhez, hogy tudj hanghívást kezdeményezni.</string>
+    <string name="permissions_rationale_msg_record_audio">A Element-nak engedély szükséges a mikrofonod eléréséhez, hogy tudj hanghívást kezdeményezni.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">"A Riot-nak engedély szükséges a mikrofonod  és kamerád eléréséhez, hogy tudj videóhívást kezdeményezni.
+    <string name="permissions_rationale_msg_camera_and_audio">"A Element-nak engedély szükséges a mikrofonod  és kamerád eléréséhez, hogy tudj videóhívást kezdeményezni.
 
 Kérlek engedélyezd a hozzáférést a következő felugró ablakban, hogy tudj hívást kezdeményezni."</string>
-    <string name="permissions_rationale_msg_contacts">A Riot a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar. Ha egyetértesz a névjegyek ilyen célú megosztásával, kérlek engedélyezd a hozzáférést a következő felugró üzenetben.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">A Riot a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar. 
+    <string name="permissions_rationale_msg_contacts">A Element a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar. Ha egyetértesz a névjegyek ilyen célú megosztásával, kérlek engedélyezd a hozzáférést a következő felugró üzenetben.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">A Element a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar.
 \n
 \nEgyetértesz a névjegyek ilyen célú megosztásával\?</string>
 
@@ -594,7 +594,7 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="encryption_information_verify_device_warning2">Ha egyezik, nyomja meg a hitelesítés gombot. Ha nem, akkor valaki más elfogta ezt a munkamenetet és érdemes lenne tiltólistára tenni. A jövőben ez a hitelesítési mód kényelmesebbé lesz téve.</string>
     <string name="encryption_information_verify_key_match">Hitelesítem, hogy a kulcsok egyeznek</string>
 
-    <string name="e2e_enabling_on_app_update">Mostantól a Riot támogatja a végtől végig titkosítást de előtte újra be kell jelentkezned, hogy bekapcsold.
+    <string name="e2e_enabling_on_app_update">Mostantól a Element támogatja a végtől végig titkosítást de előtte újra be kell jelentkezned, hogy bekapcsold.
 
 Ezt megteheted most vagy később az alkalmazás beállítások alatt.</string>
 
@@ -837,7 +837,7 @@ Ezt megteheted most vagy később az alkalmazás beállítások alatt.</string>
     <string name="settings_notification_privacy_metadata">• Az értesítések csak metaadatokat tartalmaznak</string>
     <string name="settings_notification_privacy_secure_message_content">• Az értesítés tartalma <b>közvetlenül a Matrix szerverről kerül letöltésre</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">Az értesítések <b>meta- és üzenet adatot is</b> tartalmaznak</string>
-    <string name="startup_notification_privacy_message">Riot futtatható a háttérben az értesítések biztonságos és titkos kezeléséhez, ami hatással lehet az akkumulátor használatra.</string>
+    <string name="startup_notification_privacy_message">Element futtatható a háttérben az értesítések biztonságos és titkos kezeléséhez, ami hatással lehet az akkumulátor használatra.</string>
     <string name="startup_notification_privacy_button_grant">Engedély megadása</string>
     <string name="startup_notification_privacy_button_other">Más lehetőség választása</string>
 
@@ -858,8 +858,8 @@ Ezt megteheted most vagy később az alkalmazás beállítások alatt.</string>
     <string name="settings_deactivate_my_account">Függessze fel a fiókomat</string>
 
     <string name="settings_opt_in_of_analytics">Analitikai adatok küldése</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot anonim analitikai adatokat gyűjt, hogy javítani tudjuk az alkalmazást.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Kérlek engedélyezd az analitikai adatok gyűjtését ezzel segítve a Riot fejlesztését.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element anonim analitikai adatokat gyűjt, hogy javítani tudjuk az alkalmazást.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Kérlek engedélyezd az analitikai adatok gyűjtését ezzel segítve a Element fejlesztését.</string>
     <string name="settings_opt_in_of_analytics_ok">Igen, segíteni akarok!</string>
 
     <string name="widget_integration_missing_parameter">A szükséges paraméter hiányzik.</string>
@@ -887,7 +887,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="e2e_re_request_encryption_key_sent">Kulcs újrakérve.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Kérés elküldve</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Kérlek indítsd el a Riotot egy olyan eszközön ami ezt az üzenetet vissza tudja fejteni, hogy elküldhesse a kulcsot erre a munkamenetre.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Kérlek indítsd el a Elementot egy olyan eszközön ami ezt az üzenetet vissza tudja fejteni, hogy elküldhesse a kulcsot erre a munkamenetre.</string>
 
     <string name="lock_screen_hint">Ide írj…</string>
 
@@ -1024,7 +1024,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="settings_show_avatar_display_name_changes_messages">Fiók események megjelenítése</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Avatar és név változásokat tartalmaz.</string>
     <string name="settings_password">Jelszó</string>
-    <string name="settings_labs_native_camera_summary">Rendszer kamera indítása a Riot egyedi kamera alkalmazása helyett.</string>
+    <string name="settings_labs_native_camera_summary">Rendszer kamera indítása a Element egyedi kamera alkalmazása helyett.</string>
     <string name="settings_labs_enable_send_voice_summary">Ehhez az opcióhoz egy harmadik féltől származó alkalmazásra van szükség, hogy felvedd az üzenetet.</string>
 
     <string name="command_problem_with_parameters">\"%s\" parancsnak több paraméterre van szüksége vagy valamelyik paraméter hibás.</string>
@@ -1032,7 +1032,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="markdown_has_been_disabled">Markdown tiltva.</string>
 
     <string name="settings_call_category">Hívások</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Az alapértelmezett Riot csengőhang használata bejövő hívásokhoz</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Az alapértelmezett Element csengőhang használata bejövő hívásokhoz</string>
     <string name="settings_call_ringtone_title">Bejövő hívás csengőhangja</string>
     <string name="settings_call_ringtone_dialog_title">Csengőhang kiválasztása hívásokhoz:</string>
 
@@ -1064,12 +1064,12 @@ Kérlek ellenőrizd a fiókbeállításokat.</string>
 
     <string name="settings_troubleshoot_test_device_settings_title">Munkamenet beállítások.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Az értesítések engedélyezve vannak ezen az munkameneten.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Az értesítések tiltva vannak ezen a munkameneten. Kérlek ellenőrizd a Riot beállításokat.</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">Az értesítések tiltva vannak ezen a munkameneten. Kérlek ellenőrizd a Element beállításokat.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Engedélyez</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Play Szolgáltatások ellenőrzése</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK elérhető és a legújabb verziójú.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">"Riot a Google Play Services-t használja  a „push” értesítések fogadásához, de úgy tűnik az nincs megfelelően beállítva:
+    <string name="settings_troubleshoot_test_play_services_failed">"Element a Google Play Services-t használja  a „push” értesítések fogadásához, de úgy tűnik az nincs megfelelően beállítva:
 \n%1$s"</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play Services javítása</string>
 
@@ -1096,25 +1096,25 @@ Próbáld újraindítani a szolgáltatást.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Indítás az eszköz indulásakor</string>
     <string name="settings_troubleshoot_test_service_boot_success">A szolgáltatás az eszköz újraindulásakor elindul.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">A szolgáltatás az eszköz újraindulásakor nem fog elindulni, addig nem kapsz értesítést amíg egyszer el nem indítod a Riot-ot.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">A szolgáltatás az eszköz újraindulásakor nem fog elindulni, addig nem kapsz értesítést amíg egyszer el nem indítod a Element-ot.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Indulás engedélyezése amikor az eszköz elindul</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Háttér korlátozások ellenőrzése</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">A háttér korlátozások nincsenek érvényben a Riot-hoz. Ezt a tesztet mobil hálózaton kell elvégezni (WiFi nélkül).
+    <string name="settings_troubleshoot_test_bg_restricted_success">A háttér korlátozások nincsenek érvényben a Element-hoz. Ezt a tesztet mobil hálózaton kell elvégezni (WiFi nélkül).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Háttér korlátozások vannak érvényben a Riot-hoz.
-Bármi amit a Riot el akar végezni amíg a háttérben fut, agresszívan korlátozva van. Ez érintheti az értesítéseket is.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Háttér korlátozások vannak érvényben a Element-hoz.
+Bármi amit a Element el akar végezni amíg a háttérben fut, agresszívan korlátozva van. Ez érintheti az értesítéseket is.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Korlátozások tiltása</string>
 
     <string name="settings_troubleshoot_test_battery_title">Akkumulátor optimalizáció</string>
-    <string name="settings_troubleshoot_test_battery_success">Riotot nem érinti az akkumulátor optimalizáció.</string>
+    <string name="settings_troubleshoot_test_battery_success">Elementot nem érinti az akkumulátor optimalizáció.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ha a felhasználó töltés nélkül kikapcsolt képernyővel egy ideig magára hagyja az eszközt, az eszköz „Doze” módba kerül. Ez megakadályozza az alkalmazás számára, hogy hozzáférjen a hálózathoz, nem engedi elvégezni a feladatait, szinkronizációt és az alapértelmezett riasztásait.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimalizáció figyelmen kívül hagyása</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Háttér kapcsolat</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riotnak szüksége van egy minimális háttér kapcsolat fenntartására ahhoz, hogy az értesítések biztonságban megérkezhessenek.
-A következő képernyőn el kell fogadnod, hogy a Riot folyamatosan fusson a háttérben.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Elementnak szüksége van egy minimális háttér kapcsolat fenntartására ahhoz, hogy az értesítések biztonságban megérkezhessenek.
+A következő képernyőn el kell fogadnod, hogy a Element folyamatosan fusson a háttérben.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Jogosultság megadása</string>
 
     <string name="account_email_error">Az e-mail címed ellenőrzésekor hiba történt.</string>
@@ -1124,17 +1124,17 @@ A következő képernyőn el kell fogadnod, hogy a Riot folyamatosan fusson a h
 
     <string name="no_valid_google_play_services_apk">Érvényes Google Play Services APK nem található. Az értesítések megbízhatatlanul működhetnek.</string>
 
-    <string name="store_title">Riot.im - Beszélgess, ahogy tetszik</string>
+    <string name="store_title">Element - Beszélgess, ahogy tetszik</string>
     <string name="store_short_description">Egy biztonságos és univerzális csevegő alkalmazás az irányításod alatt.</string>
-    <string name="store_full_description">A csevegő alkalmazás ami személyre szabható és az irányításod alatt marad. Riot megteremti a lehetőséget, hogy úgy beszélgess ahogy szeretnél. A [matrix] hálózathoz tervezve - ami egy nyílt és elosztott hálózat.
+    <string name="store_full_description">A csevegő alkalmazás ami személyre szabható és az irányításod alatt marad. Element megteremti a lehetőséget, hogy úgy beszélgess ahogy szeretnél. A [matrix] hálózathoz tervezve - ami egy nyílt és elosztott hálózat.
 \n
 \nKészíts egy ingyenes matrix.org fiókot vagy igényelj egy saját szervert a https://modular.im -től, de üzemeltethetsz is saját Matrix szervert.
 \n
-\nMiért válaszd a Riot.im-et\?
+\nMiért válaszd a Element-et\?
 \n
 \n• TELJES KOMMUNIKÁCIÓ: Nyiss szobákat a csoportod, barátaid, közösséged vagy bárkiknek akiknek szeretnél! Beszélgess, ossz meg fájlokat, adj hozzá kisalkalmazásokat és indíts hang és videóhívásokat - teljesen ingyen.
 \n
-\n• ERŐS KAPCSOLATOK: Használd a Riot-ot a kedvenc eszközeiddel. A Riottal még másik rendszerekben lévő emberekkel és csoportokkal is képes lehetsz beszélgetni.
+\n• ERŐS KAPCSOLATOK: Használd a Element-ot a kedvenc eszközeiddel. A Elementtal még másik rendszerekben lévő emberekkel és csoportokkal is képes lehetsz beszélgetni.
 \n
 \n• SZEMÉLYES ÉS BIZTONSÁGOS: Tartsd a beszélgetéseidet titokban. A végponttól-végpontig titkosítás biztosítja, hogy a személyes beszélgetések személyesek maradnak.
 \n
@@ -1144,7 +1144,7 @@ A következő képernyőn el kell fogadnod, hogy a Riot folyamatosan fusson a h
 
     <string name="video_call_in_progress">Videóhívás folyamatban…</string>
 
-    <string name="store_whats_new">"Folyamatosan változtatjuk és javítjuk a Riot.im-et.
+    <string name="store_whats_new">"Folyamatosan változtatjuk és javítjuk a Element-et.
 A változások teljes listája itt található: %1$s.
 Nehogy lemaradj bármiről, ezért továbbra is engedélyezd a frissítéseket."</string>
     <string name="title_activity_keys_backup_setup">Kulcsmentés</string>
@@ -1165,11 +1165,11 @@ Nehogy lemaradj bármiről, ezért továbbra is engedélyezd a frissítéseket."
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Beállítások ellenőrzése</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Ez a hiba a Rioton kívül van és a Google szerint ez a hiba azt jelzi, hogy túl sok alkalmazás használja az FCM-et. Ez a hiba akkor szokott előfordulni, ha nagyon sok alkalmazás van ezért egy átlagos felhasználót nem nagyon érinthet.</string>
+Ez a hiba a Elementon kívül van és a Google szerint ez a hiba azt jelzi, hogy túl sok alkalmazás használja az FCM-et. Ez a hiba akkor szokott előfordulni, ha nagyon sok alkalmazás van ezért egy átlagos felhasználót nem nagyon érinthet.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-Ez a hiba a Rioton kívül van. Több okból is előjöhet. Lehet, ha később próbálod már működni fog, de megnézheted, hogy a Google Play szolgáltatásnak nincs beállítva adathasználati korlátozás a rendszer beállításokban vagy, hogy az eszközöd órája helyesen jár-e de ezt előfordulhat egyedi ROM esetén is.</string>
+Ez a hiba a Elementon kívül van. Több okból is előjöhet. Lehet, ha később próbálod már működni fog, de megnézheted, hogy a Google Play szolgáltatásnak nincs beállítva adathasználati korlátozás a rendszer beállításokban vagy, hogy az eszközöd órája helyesen jár-e de ezt előfordulhat egyedi ROM esetén is.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Ez a hiba a Rioton kívül van. Nincs Google fiók az eszközön. Kérlek nyisd meg a fiókkezelőt és adj hozzá egy Google fiókot.</string>
+Ez a hiba a Elementon kívül van. Nincs Google fiók az eszközön. Kérlek nyisd meg a fiókkezelőt és adj hozzá egy Google fiókot.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Fiók hozzáadása</string>
 
     <string name="settings_noisy_notifications_preferences">Hangos értesítések beállítása</string>
@@ -1185,7 +1185,7 @@ Ez a hiba a Rioton kívül van. Nincs Google fiók az eszközön. Kérlek nyisd
     <string name="passphrase_empty_error_message">Kérlek adj meg egy jelmondatot</string>
     <string name="passphrase_passphrase_too_weak">A jelmondat túl gyenge</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Ha azt szeretnéd, hogy a Riot Visszaállítási Kulcsot generáljon akkor kérlek töröld a jelmondatot.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Ha azt szeretnéd, hogy a Element Visszaállítási Kulcsot generáljon akkor kérlek töröld a jelmondatot.</string>
     <string name="keys_backup_no_session_error">Jelenleg nincs Matrix kapcsolat</string>
 
     <string name="keys_backup_setup_step1_title">Soha ne veszíts el titkosított üzenetet</string>
@@ -1348,7 +1348,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="autodiscover_invalid_response">A Matrix szerver felderítésére érvénytelen válasz érkezett</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Szerver beállítások automatikus kiegészítése</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot egyedi szerver beállítást észlelt a felhasználói azonosítód domain-jéhez: \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element egyedi szerver beállítást észlelt a felhasználói azonosítód domain-jéhez: \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Beállítás használata</string>
 
@@ -1488,7 +1488,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="group_all_communities">Minden közösség</string>
 
     <string name="room_preview_no_preview">Ennek a szobának nincs előnézete</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">A RiotX-ben a nyilvános szoba előnézete egyelőre nem támogatott</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">A Element-ben a nyilvános szoba előnézete egyelőre nem támogatott</string>
 
     <string name="fab_menu_create_room">Szobák</string>
     <string name="fab_menu_create_chat">Közvetlen üzenetek</string>
@@ -1505,7 +1505,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="keys_backup_unable_to_get_keys_backup_data">A kulcs mentés adatainak beszerzésekor hiba történt</string>
 
     <string name="alpha_disclaimer_title">Üdv a béta verzióban!</string>
-    <string name="alpha_disclaimer_content_line_1">Amíg a RiotX újdonsült fejlesztés, néhány funkció hiányozhat és találkozhatsz hibákkal.</string>
+    <string name="alpha_disclaimer_content_line_1">Amíg a Element újdonsült fejlesztés, néhány funkció hiányozhat és találkozhatsz hibákkal.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">A legfrissebb funkciók listáját itt találod: %1$s, és ha hibát találsz kérlek küldj egy jelentést róla a Kezdő oldal bal felső sarkában lévő menüvel és ahogy tudjuk javítjuk.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play áruház leírás</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Ha hibát találsz kérlek küldj egy jelentést róla a Kezdő oldal bal felső sarkában lévő menüvel és ahogy tudjuk javítjuk.</string>
@@ -1547,15 +1547,15 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="settings_labs_show_hidden_events_in_timeline">Rejtett események megjelenítése az idővonalon</string>
 
-    <string name="store_riotx_title">RiotX - Matrix Kliens Új Nemzedéke</string>
+    <string name="store_riotx_title">Element - Matrix Kliens Új Nemzedéke</string>
     <string name="store_riotx_short_description">A gyorsabb és kisebb Matrix kliens ami a legfrissebb Android keretrendszert használja</string>
-    <string name="store_riotx_full_description">RiotX a Matrix protokollhoz (Matrix.org) készült új kliens: nyílt hálózat biztonságos és decentralizált kommunikációhoz. RiotX a Riot Android kliens teljesen újraírt változata ami a teljesen újraírt Matrix Android SDK-ra épül.
+    <string name="store_riotx_full_description">Element a Matrix protokollhoz (Matrix.org) készült új kliens: nyílt hálózat biztonságos és decentralizált kommunikációhoz. Element a Riot Android kliens teljesen újraírt változata ami a teljesen újraírt Matrix Android SDK-ra épül.
 \n
-\nFigyelmeztetés: Ez egy béta verzió. RiotX aktív fejlesztés alatt áll és vannak korlátai és (reméljük nem olyan sok) hibái. Minden visszajelzést szívesen fogadunk!
+\nFigyelmeztetés: Ez egy béta verzió. Element aktív fejlesztés alatt áll és vannak korlátai és (reméljük nem olyan sok) hibái. Minden visszajelzést szívesen fogadunk!
 \n
-\nRiotX ezeket támogatja: • Bejelentkezés létező fiókba • Szoba készítés és nyilvános szobába való belépés • Meghívók fogadása és elutasítás • Felhasználók szobáinak listázása • Szoba adatainak megtekintése • Szöveges üzenet küldése • Csatolmány küldése • Titkosított szobákban üzenetek olvasása és írása • Titkosítás: Végponttól végpontig titkosító kulcsok mentése, fejlett eszköz ellenőrzés, kulcs megosztás kérése és válasz • „Push” értesítések • Világos, sötét és fekete téma
+\nElement ezeket támogatja: • Bejelentkezés létező fiókba • Szoba készítés és nyilvános szobába való belépés • Meghívók fogadása és elutasítás • Felhasználók szobáinak listázása • Szoba adatainak megtekintése • Szöveges üzenet küldése • Csatolmány küldése • Titkosított szobákban üzenetek olvasása és írása • Titkosítás: Végponttól végpontig titkosító kulcsok mentése, fejlett eszköz ellenőrzés, kulcs megosztás kérése és válasz • „Push” értesítések • Világos, sötét és fekete téma
 \n
-\nNem minden Riot funkció támogatott a RiotX-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Szoba beállítások (szoba tagság mutatása, stb…) • Hívások • Kisalkalmazások • …</string>
+\nNem minden Element funkció támogatott a Element-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Szoba beállítások (szoba tagság mutatása, stb…) • Hívások • Kisalkalmazások • …</string>
 
     <string name="bottom_action_people_x">Közvetlen beszélgetés</string>
 
@@ -1607,7 +1607,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="widget_integration_review_terms">A továbblépéshez el kell fogadnod a Felhasználási feltételeket.</string>
 
-    <string name="security_warning_identity_server">A Riot előző verziója egy biztonsági hibát tartalmazott ami az Azonosítási Szervernek (%1$s) hozzáférést adott a fiókodhoz. Ha megbízol a %2$s szerverben, akkor ezt figyelmen kívül hagyhatod különben jelentkezz ki és újra vissza.
+    <string name="security_warning_identity_server">A Element előző verziója egy biztonsági hibát tartalmazott ami az Azonosítási Szervernek (%1$s) hozzáférést adott a fiókodhoz. Ha megbízol a %2$s szerverben, akkor ezt figyelmen kívül hagyhatod különben jelentkezz ki és újra vissza.
 \n
 \nTovábbi információ itt:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1641,11 +1641,11 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="invite_no_identity_server_error">A beállításokban adj hozzá egy azonosítási szervert ehhez a művelethez.</string>
     <string name="settings_background_fdroid_sync_mode">Háttér Szinkronizálási Mód (Kísérleti)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimalizált akkumulátor használat</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot a háttérben úgy szinkronizál, hogy a leginkább kímélje az eszköz korlátozott erőforrásait (akkumulátor).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element a háttérben úgy szinkronizál, hogy a leginkább kímélje az eszköz korlátozott erőforrásait (akkumulátor).
 \nAz eszköz erőforrásainak állapotától függően a szinkronizációt az operációs rendszer elhalaszthatja.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimalizálás valós idejű használatra</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot a háttérben rendszeresen, pontosan a megadott időközönként, szinkronizálni fog (beállítható).
-\nEz befolyásolja a rádió és az akkumulátor használatot, és folyamatosan egy értesítés fog megjelenni arról, hogy a riot figyel a neki küldött eseményekre.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element a háttérben rendszeresen, pontosan a megadott időközönként, szinkronizálni fog (beállítható).
+\nEz befolyásolja a rádió és az akkumulátor használatot, és folyamatosan egy értesítés fog megjelenni arról, hogy a Element figyel a neki küldött eseményekre.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Nincs szinkroniziálás a háttérben</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nem leszel értesítve az érkező üzenetekről, ha az alkalmazás csak a háttérben fut.</string>
     <string name="settings_background_sync_update_error">A beállítások frissítése nem sikerült.</string>
@@ -1749,14 +1749,14 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \n
 \n Ha nem akarsz ettől a felhasználótól több üzenetet látni akkor blokkolhatod, hogy az üzenetei ne jelenjenek meg számodra</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riotnak engedélyre van szüksége ahhoz, hogy a végponttól végpontig titkosító kulcsokat a lemezre menthesse.
+    <string name="permissions_rationale_msg_keys_backup_export">Elementnak engedélyre van szüksége ahhoz, hogy a végponttól végpontig titkosító kulcsokat a lemezre menthesse.
 \n
 \nKérlek a következő felugró ablakban engedélyezd a hozzáférést, hogy a kulcsokat kézzel kimenthesd.</string>
 
     <string name="no_network_indicator">Jelenleg nincs hálózati kapcsolat</string>
 
     <string name="settings_add_3pid_confirm_password_title">Jelszó megerősítés</string>
-    <string name="settings_add_3pid_flow_not_supported">Riot mobilról ezt nem teheted meg</string>
+    <string name="settings_add_3pid_flow_not_supported">Element mobilról ezt nem teheted meg</string>
     <string name="settings_add_3pid_authentication_needed">Azonosítás szükséges</string>
 
 
@@ -1830,18 +1830,18 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="login_continue">Folytatás</string>
     <string name="login_connect_to">Csatlakozás ide: %1$s</string>
-    <string name="login_connect_to_modular">Csatlakozás Modularhoz</string>
+    <string name="login_connect_to_modular">Csatlakozás Element Matrix Services hoz</string>
     <string name="login_connect_to_a_custom_server">Csatlakozás egyedi matrix szerverhez</string>
     <string name="login_signin_to">Bejelentkezés ide: %1$s</string>
     <string name="login_signup">Fiók készítés</string>
     <string name="login_signin">Bejelentkezés</string>
     <string name="login_signin_sso">SSO-val való folytatás</string>
 
-    <string name="login_server_url_form_modular_hint">Modular Cím</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Cím</string>
     <string name="login_server_url_form_other_hint">Cím</string>
     <string name="login_server_url_form_modular_text">Prémium üzemeltetés szervezetek részére</string>
-    <string name="login_server_url_form_modular_notice">Add meg az általad használt Modular szerver, vagy a hozzá tartozó Riot címét</string>
-    <string name="login_server_url_form_other_notice">Add meg a szerver vagy Riot címét amihez csatlakozni szeretnél</string>
+    <string name="login_server_url_form_modular_notice">Add meg az általad használt Modular szerver, vagy a hozzá tartozó Element címét</string>
+    <string name="login_server_url_form_other_notice">Add meg a szerver vagy Element címét amihez csatlakozni szeretnél</string>
 
     <string name="login_sso_error_message">Az oldal betöltésekor hiba történt: %1$s (%2$d)</string>
     <string name="login_registration_disabled">Ne haragudj, ez a szerver nem fogad új fiókokat.</string>
@@ -1914,7 +1914,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nMegállítód a regisztrációt\?</string>
 
     <string name="login_a11y_choose_matrix_org">matrix.org kiválasztása</string>
-    <string name="login_a11y_choose_modular">Modular kiválasztása</string>
+    <string name="login_a11y_choose_modular">Element Matrix Services kiválasztása</string>
     <string name="login_a11y_choose_other">Egyedi matrix szerver kiválasztása</string>
     <string name="login_a11y_captcha_container">Kérlek old meg a captcha-t</string>
     <string name="login_terms_title">Folytatáshoz fogadd el a feltételeket</string>
@@ -1960,7 +1960,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nA fiók és az üzeneteid eléréséhez jelentkezz be.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Elveszted a hozzáférésedet a titkosított üzeneteidhez ha nem jelentkezel be a titkosítási kulcsok visszaállításához.</string>
     <string name="soft_logout_clear_data_dialog_submit">Adat törlése</string>
-    <string name="soft_logout_sso_not_same_user_error">A jelenlegi munkamenet %1$s felhasználóhoz tartozik és %2$s azonosítási adatait adtad meg. Ez RiotX-ben nem támogatott.
+    <string name="soft_logout_sso_not_same_user_error">A jelenlegi munkamenet %1$s felhasználóhoz tartozik és %2$s azonosítási adatait adtad meg. Ez Element-ben nem támogatott.
 \nElőször töröld az adatokat, majd a másik felhasználói fiókba lépj be.</string>
 
     <string name="permalink_malformed">A matrix.to linked hibás</string>
@@ -1983,7 +1983,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="autocomplete_limited_results">Csak az első találat megmutatása, gépelj több betűt…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Összeomlás-hamar</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX a nem várt hibák esetén többször fog összeomlani</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element a nem várt hibák esetén többször fog összeomlani</string>
     <string name="command_description_verify">Az adott felhasználói azonosító ellenőrzésének kérése</string>
     <string name="command_description_shrug">Hozzáteszi a sima szöveges üzenethez ezt: ¯\\_(ツ)_/¯</string>
 
@@ -2073,9 +2073,9 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="room_member_jump_to_read_receipt">Olvasási visszaigazolásra ugrás</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX nem kezeli ezt az eseményt: \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX nem kezeli ezt az üzenet típust: \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX problémába ütközött az esemény (azon: %1$s) megjelenítésekor</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element nem kezeli ezt az eseményt: \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element nem kezeli ezt az üzenet típust: \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element problémába ütközött az esemény (azon: %1$s) megjelenítésekor</string>
 
     <string name="unignore">Figyelembe vesz</string>
 
@@ -2205,7 +2205,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="keys_backup_restore_success_title_already_up_to_date">A kulcsok már frissek!</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Kulcs kérések</string>
 
@@ -2344,12 +2344,12 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="error_adding_media_file_to_gallery">A média fájlt nem sikerült hozzáadni a Galériához</string>
     <string name="change_password_summary">Új fiók jelszó beállítása…</string>
 
-    <string name="riot_desktop_web">Riot Web
-\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X for Android</string>
+    <string name="riot_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="riot_ios_android">Element iOS
+\nElement X for Android</string>
     <string name="or_other_mx_capabale_client">vagy másik eszközök közötti hitelesítésre alkalmas Matrix kliensre</string>
-    <string name="use_latest_riot">A Riot legújabb kliensét használd a többi eszközödön:</string>
+    <string name="use_latest_riot">A Element legújabb kliensét használd a többi eszközödön:</string>
     <string name="command_description_discard_session">A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában</string>
     <string name="command_description_discard_session_not_handled">Csak a titkosított szobákban támogatott</string>
     <string name="enter_secret_storage_passphrase_or_key">Használd ezt: %1$s vagy ezt: %2$s a továbblépéshez.</string>
@@ -2373,7 +2373,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="error_empty_field_choose_password">Kérlek válassz jelszót.</string>
     <string name="external_link_confirmation_title">Ezt a hivatkozást ellenőrizd le még egyszer</string>
     <string name="create_room_dm_failure">A közvetlen üzenetedet nem sikerült elkészíteni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.</string>
-    <string name="use_other_session_content_description">Használd a legújabb Riotot a másik eszközödön, úgy mint Riot Web, Asztali Riot, RiotX for Android vagy más eszközök közötti hitelesítést támogató másik Matrix klienst</string>
+    <string name="use_other_session_content_description">Használd a legújabb Elementot a másik eszközödön, úgy mint Element Web, Asztali Element, Element for Android vagy más eszközök közötti hitelesítést támogató másik Matrix klienst</string>
     <string name="confirm_your_identity">Erősítsd meg ebben a bejelentkezésben a személyazonosságodat egy másik munkamenetből, hogy hozzáférhess a titkosított üzenetekhez.</string>
     <string name="external_link_confirmation_message">%1$s hivatkozás egy másik oldalra visz: %2$s.
 \n
@@ -2424,11 +2424,11 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="choose_locale_loading_locales">Elérhető nyelvek betöltése…</string>
 
     <string name="open_terms_of">Megnyitás: %s feltételek</string>
-    <string name="identity_server_error_outdated_identity_server">Ez az azonosítási szerver régi. RiotX csak az API V2-t támogatja.</string>
+    <string name="identity_server_error_outdated_identity_server">Ez az azonosítási szerver régi. Element csak az API V2-t támogatja.</string>
     <string name="identity_server_error_outdated_home_server">Ez a művelet nem támogatott. A Matrix szerver elavult.</string>
     <string name="identity_server_error_no_identity_server_configured">Kérlek először állíts be egy azonosítási szervert.</string>
     <string name="identity_server_error_terms_not_signed">Kérlek először fogadd el az azonosítási szerver felhasználási feltételeit a beállításokban.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">A biztonságod érdekében RiotX csak hash-selt e-mail cím és telefonszám küldését támogatja.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">A biztonságod érdekében Element csak hash-selt e-mail cím és telefonszám küldését támogatja.</string>
     <string name="identity_server_error_binding_error">A megfeleltetés sikertelen.</string>
     <string name="identity_server_error_no_current_binding_error">Ezzel az azonosítóval jelenleg nincs megfeleltetve semmi.</string>
 
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
index 6e020470b3..d27d24ee9c 100644
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@@ -150,7 +150,7 @@
 
     <string name="later">Nanti</string>
     <string name="send_anyway">Kirim Saja</string>
-    <string name="no_contact_access_placeholder">Riot belum diijinkan untuk mengakses kontak lokal</string>
+    <string name="no_contact_access_placeholder">Element belum diijinkan untuk mengakses kontak lokal</string>
     <string name="send_bug_report_include_crash_logs">Kirim log gangguan</string>
     <string name="huge">Raksasa</string>
     <string name="small">Kecil</string>
@@ -249,18 +249,18 @@ Mohon maaf untuk ketidaknyamannya.</string>
     <string name="media_picker_both_capture_title">Ambil gambar atau video</string>
     <string name="media_picker_cannot_record_video">Tidak bisa merekam video</string>
 
-    <string name="permissions_rationale_msg_storage">Riot membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
+    <string name="permissions_rationale_msg_storage">Element membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
 
 Harap berikan akses pada halaman berikut agar berkas dapat dikirim dari ponsel Anda.</string>
-    <string name="permissions_rationale_msg_camera">Riot membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
+    <string name="permissions_rationale_msg_camera">Element membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
+    <string name="permissions_rationale_msg_record_audio">Element membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
+    <string name="permissions_rationale_msg_camera_and_audio">Element membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
 
 Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="light_theme">Tema Terang</string>
@@ -322,7 +322,7 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Permintaan terkirim</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Jalankan Riot di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Jalankan Element di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
 
     <string name="groups_list">Daftar Grup</string>
 
@@ -331,12 +331,12 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     </plurals>
 
     <string name="call">Panggilan</string>
-    <string name="permissions_rationale_msg_contacts">Riot memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
+    <string name="permissions_rationale_msg_contacts">Element memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
 
-Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna Riot yang terdapat di daftar kontak Anda.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
+Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna Element yang terdapat di daftar kontak Anda.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
 
-Bolehkah Riot mengakses daftar kontak Anda?</string>
+Bolehkah Element mengakses daftar kontak Anda?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">"Maaf.  Tidak dapat dilakukan karena belum menerima permisi"</string>
 
@@ -715,7 +715,7 @@ Pembacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan
     <string name="encryption_information_verify_device_warning2">Apabila cocok, tekan tombol verifikasi berikut.
 Apabila tidak, seseorang sedang menyadap perangkat ini dan mungkin perlu diblokir.
 Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
-    <string name="e2e_enabling_on_app_update">Riot sekarang mendukung enkripsi ujung-ke-ujung tapi Anda perlu masuk kembali untuk mengaktifkannya.
+    <string name="e2e_enabling_on_app_update">Element sekarang mendukung enkripsi ujung-ke-ujung tapi Anda perlu masuk kembali untuk mengaktifkannya.
 
 Ini bisa Anda lakukan sekarang atau nani dari pengaturan aplikasi.</string>
 
@@ -861,14 +861,14 @@ Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
     <string name="settings_deactivate_my_account">Deaktivasi akunku</string>
 
     <string name="startup_notification_privacy_title">Kerahasiaan Notifikasi</string>
-    <string name="startup_notification_privacy_message">Riot dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
+    <string name="startup_notification_privacy_message">Element dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
     <string name="startup_notification_privacy_button_grant">Kabulkan permisi</string>
     <string name="startup_notification_privacy_button_other">Pilih opsi lain</string>
 
     <string name="settings_analytics">Analitik</string>
     <string name="settings_opt_in_of_analytics">Kirim data analitik</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Ya, saya ingin membantu!</string>
 
     <string name="settings_data_save_mode">Mode hemat data</string>
@@ -955,7 +955,7 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
 
     <string name="settings_call_category">Panggilan</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gunakan nada dering semula Riot untuk panggilan masuk</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
     <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
     <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
 
@@ -988,12 +988,12 @@ Mohon periksa pengaturan akun.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
-Mohon periksa pengaturan Riot.</string>
+Mohon periksa pengaturan Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Pemeriksaan Layanan Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Layanan Google Play ditemukan dan telah diperbaharui.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
+    <string name="settings_troubleshoot_test_play_services_failed">Element menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Perbaiki Layanan Google Play</string>
 
@@ -1020,19 +1020,19 @@ Coba nyalakan kembali aplikasi.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka Riot.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka Element.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk Riot. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk Element. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk Element.
 Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemberitahuan.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Matikan penghalang</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimisasi Baterai</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot tidak terpengaruh oleh Optimisasi Baterai.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element tidak terpengaruh oleh Optimisasi Baterai.</string>
     <string name="title_activity_keys_backup_setup">Cadangkan Kunci</string>
     <string name="title_activity_keys_backup_restore">Gunakan Cadangan Kunci</string>
 
@@ -1063,11 +1063,11 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Periksa Aturan</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nError ini di luar kendali Riot dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
+\nError ini di luar kendali Element dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nError ini di luar kendali Riot, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
+\nError ini di luar kendali Element, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nError ini di luar kendali Riot. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
+\nError ini di luar kendali Element. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
 
     <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 6e020470b3..d27d24ee9c 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -150,7 +150,7 @@
 
     <string name="later">Nanti</string>
     <string name="send_anyway">Kirim Saja</string>
-    <string name="no_contact_access_placeholder">Riot belum diijinkan untuk mengakses kontak lokal</string>
+    <string name="no_contact_access_placeholder">Element belum diijinkan untuk mengakses kontak lokal</string>
     <string name="send_bug_report_include_crash_logs">Kirim log gangguan</string>
     <string name="huge">Raksasa</string>
     <string name="small">Kecil</string>
@@ -249,18 +249,18 @@ Mohon maaf untuk ketidaknyamannya.</string>
     <string name="media_picker_both_capture_title">Ambil gambar atau video</string>
     <string name="media_picker_cannot_record_video">Tidak bisa merekam video</string>
 
-    <string name="permissions_rationale_msg_storage">Riot membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
+    <string name="permissions_rationale_msg_storage">Element membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
 
 Harap berikan akses pada halaman berikut agar berkas dapat dikirim dari ponsel Anda.</string>
-    <string name="permissions_rationale_msg_camera">Riot membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
+    <string name="permissions_rationale_msg_camera">Element membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
+    <string name="permissions_rationale_msg_record_audio">Element membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
+    <string name="permissions_rationale_msg_camera_and_audio">Element membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
 
 Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="light_theme">Tema Terang</string>
@@ -322,7 +322,7 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Permintaan terkirim</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Jalankan Riot di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Jalankan Element di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
 
     <string name="groups_list">Daftar Grup</string>
 
@@ -331,12 +331,12 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     </plurals>
 
     <string name="call">Panggilan</string>
-    <string name="permissions_rationale_msg_contacts">Riot memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
+    <string name="permissions_rationale_msg_contacts">Element memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
 
-Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna Riot yang terdapat di daftar kontak Anda.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
+Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna Element yang terdapat di daftar kontak Anda.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
 
-Bolehkah Riot mengakses daftar kontak Anda?</string>
+Bolehkah Element mengakses daftar kontak Anda?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">"Maaf.  Tidak dapat dilakukan karena belum menerima permisi"</string>
 
@@ -715,7 +715,7 @@ Pembacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan
     <string name="encryption_information_verify_device_warning2">Apabila cocok, tekan tombol verifikasi berikut.
 Apabila tidak, seseorang sedang menyadap perangkat ini dan mungkin perlu diblokir.
 Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
-    <string name="e2e_enabling_on_app_update">Riot sekarang mendukung enkripsi ujung-ke-ujung tapi Anda perlu masuk kembali untuk mengaktifkannya.
+    <string name="e2e_enabling_on_app_update">Element sekarang mendukung enkripsi ujung-ke-ujung tapi Anda perlu masuk kembali untuk mengaktifkannya.
 
 Ini bisa Anda lakukan sekarang atau nani dari pengaturan aplikasi.</string>
 
@@ -861,14 +861,14 @@ Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
     <string name="settings_deactivate_my_account">Deaktivasi akunku</string>
 
     <string name="startup_notification_privacy_title">Kerahasiaan Notifikasi</string>
-    <string name="startup_notification_privacy_message">Riot dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
+    <string name="startup_notification_privacy_message">Element dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
     <string name="startup_notification_privacy_button_grant">Kabulkan permisi</string>
     <string name="startup_notification_privacy_button_other">Pilih opsi lain</string>
 
     <string name="settings_analytics">Analitik</string>
     <string name="settings_opt_in_of_analytics">Kirim data analitik</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Ya, saya ingin membantu!</string>
 
     <string name="settings_data_save_mode">Mode hemat data</string>
@@ -955,7 +955,7 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
 
     <string name="settings_call_category">Panggilan</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gunakan nada dering semula Riot untuk panggilan masuk</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
     <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
     <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
 
@@ -988,12 +988,12 @@ Mohon periksa pengaturan akun.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
-Mohon periksa pengaturan Riot.</string>
+Mohon periksa pengaturan Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Pemeriksaan Layanan Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Layanan Google Play ditemukan dan telah diperbaharui.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
+    <string name="settings_troubleshoot_test_play_services_failed">Element menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Perbaiki Layanan Google Play</string>
 
@@ -1020,19 +1020,19 @@ Coba nyalakan kembali aplikasi.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka Riot.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka Element.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk Riot. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk Element. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk Element.
 Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemberitahuan.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Matikan penghalang</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimisasi Baterai</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot tidak terpengaruh oleh Optimisasi Baterai.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element tidak terpengaruh oleh Optimisasi Baterai.</string>
     <string name="title_activity_keys_backup_setup">Cadangkan Kunci</string>
     <string name="title_activity_keys_backup_restore">Gunakan Cadangan Kunci</string>
 
@@ -1063,11 +1063,11 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Periksa Aturan</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nError ini di luar kendali Riot dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
+\nError ini di luar kendali Element dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nError ini di luar kendali Riot, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
+\nError ini di luar kendali Element, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nError ini di luar kendali Riot. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
+\nError ini di luar kendali Element. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
 
     <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index c760ee128f..5150d02c2c 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -694,7 +694,7 @@ Til að halda áfram skaltu setja inn lykilorðið þitt.</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Ógilt snið samnefnis</string>
     <string name="directory_server_fail_to_retrieve_server">Netþjónninn gæti verið undir miklu álagi eða ekki til taks</string>
     <string name="missing_permissions_warning">Þar sem ýmsar heimildir vantar, eru sumir eiginleikar ekki tiltækir…</string>
-    <string name="no_contact_access_placeholder">Þú heimilaðir Riot ekki aðgang að tengiliðum á tækinu</string>
+    <string name="no_contact_access_placeholder">Þú heimilaðir Element ekki aðgang að tengiliðum á tækinu</string>
     <string name="send_bug_report_rage_shake">Hristu ákveðið til að senda villutilkynningu</string>
 
     <string name="send_bug_report_sent">Það tókst að senda villuskýrsluna</string>
@@ -716,7 +716,7 @@ Ertu alveg viss?</string>
     <string name="settings_set_sync_delay">Hlé milli tveggja samstillingarbeiðna</string>
     <string name="settings_keep_media">Halda gögnum</string>
 
-    <string name="startup_notification_privacy_message">Riot getur keyrt í bakgrunni og stýrt tilkynningum á öruggan hátt (getur haft áhrif á rafhlöðunotkun).</string>
+    <string name="startup_notification_privacy_message">Element getur keyrt í bakgrunni og stýrt tilkynningum á öruggan hátt (getur haft áhrif á rafhlöðunotkun).</string>
 
     <string name="account_email_validation_message">Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram.</string>
     <string name="account_email_validation_error">Tókst ekki að sannreyna tölvupóstfang. Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram</string>
@@ -748,26 +748,26 @@ Ertu alveg viss?</string>
 
     <string name="login_error_unknown_token">Tiltekið aðgangsteikn þekktist ekki</string>
     <string name="call_error_user_not_responding">Ekki var svarað á fjartengda endanum.</string>
-    <string name="permissions_rationale_msg_storage">Riot þarf heimild til að nota mynda- og myndskeiðasafn svo hægt sé að senda og vista viðhengi.
+    <string name="permissions_rationale_msg_storage">Element þarf heimild til að nota mynda- og myndskeiðasafn svo hægt sé að senda og vista viðhengi.
 
 Leyfðu aðgang í næsta sprettglugga til þess að geta sent skrár úr símanum.</string>
-    <string name="permissions_rationale_msg_camera">Riot þarf heimild til að nota myndavélina svo hægt sé að taka myndir og hringja myndsímtöl.</string>
+    <string name="permissions_rationale_msg_camera">Element þarf heimild til að nota myndavélina svo hægt sé að taka myndir og hringja myndsímtöl.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Leyfðu aðgang í næsta sprettglugga til þess að geta hringt.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot þarf heimild til að nota hljóðnemann svo hægt sé að hringja hljóðsímtöl.</string>
+    <string name="permissions_rationale_msg_record_audio">Element þarf heimild til að nota hljóðnemann svo hægt sé að hringja hljóðsímtöl.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Leyfðu aðgang í næsta sprettglugga til þess að geta hringt.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot þarf heimild til að nota myndavélina og hljóðnemann svo hægt sé að hringja myndsímtöl.
+    <string name="permissions_rationale_msg_camera_and_audio">Element þarf heimild til að nota myndavélina og hljóðnemann svo hægt sé að hringja myndsímtöl.
 
 Leyfðu aðgang í næstu sprettgluggum til þess að geta hringt.</string>
-    <string name="permissions_rationale_msg_contacts">Riot þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
+    <string name="permissions_rationale_msg_contacts">Element þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
 
-Leyfðu aðgang í næsta sprettglugga til þess að finna þá notendur í nafnaskránni sem hægt er að hafa samband við úr Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
+Leyfðu aðgang í næsta sprettglugga til þess að finna þá notendur í nafnaskránni sem hægt er að hafa samband við úr Element.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
 
-Leyfa Riot nota tengiliðina ?</string>
+Leyfa Element nota tengiliðina ?</string>
 
     <string name="settings_deactivate_account_section">Gera notandaaðgang óvirkann</string>
     <string name="settings_deactivate_my_account">Gera notandaaðganginn minn óvirkann</string>
@@ -794,8 +794,8 @@ Leyfa Riot nota tengiliðina ?</string>
     <string name="login_error_login_email_not_yet">Tölvupósttengill sem ekki er enn búið að smella á</string>
 
     <string name="malformed_id">Rangt formað auðkenni. Ætti að vera tölvupóstfang eða Matrix-auðkenni á borð við\'@sérheiti:lén\'</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Endilega virkjaðu greiningargögn til að hjálpa okkur að bæta Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Endilega virkjaðu greiningargögn til að hjálpa okkur að bæta Element.</string>
     <string name="room_settings_room_access_warning">Til að tengja við spjallrás verður hún að vera með vistfang.</string>
     <string name="room_preview_try_join_an_unknown_room">Þú ert að reyna að tengjast %s. Myndirðu vilja gerast meðlimur til að geta tekið þátt í samræðunni?</string>
     <string name="room_preview_room_interactions_disabled">Þetta er forskoðun á spjallrásinni. Samskipti spjallrásarinnar hafa verið gerð óvirk.</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index fcf06fe278..eeffdee768 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -87,7 +87,7 @@
     <string name="user_directory_header">Elenco utenti</string>
     <string name="matrix_only_filter">Mostra solo i contatti Matrix</string>
     <string name="no_conversation_placeholder">Nessuna conversazione</string>
-    <string name="no_contact_access_placeholder">Riot non ha avuto l\'autorizzazione ad accedere alla tua Rubrica locale</string>
+    <string name="no_contact_access_placeholder">Element non ha avuto l\'autorizzazione ad accedere alla tua Rubrica locale</string>
     <string name="no_result_placeholder">Nessun risultato</string>
 
     <!-- Rooms fragment -->
@@ -106,7 +106,7 @@
     <string name="send_bug_report">Segnala errore</string>
     <string name="send_bug_report_description">Per favore descrivi l\'errore. Cosa stavi facendo\? Cosa ti aspettavi dovesse accadere\? Cosa è effettivamente successo\?</string>
     <string name="send_bug_report_placeholder">Descrivi qui il problema</string>
-    <string name="send_bug_report_logs_description">Per permettere una diagnosi del problema, oltre alla segnalazione errore verranno inviati anche i registri di Riot. Rapporto, registri e schermata non saranno resi pubblici. Tuttavia, se preferisci inviare solamente la segnalazione, deseleziona:</string>
+    <string name="send_bug_report_logs_description">Per permettere una diagnosi del problema, oltre alla segnalazione errore verranno inviati anche i registri di Element. Rapporto, registri e schermata non saranno resi pubblici. Tuttavia, se preferisci inviare solamente la segnalazione, deseleziona:</string>
     <string name="send_bug_report_alert_message">Sembra tu stia scuotendo il dispositivo con rabbia. Vuoi segnalare un errore\?</string>
     <string name="send_bug_report_app_crashed">L\'ultima volta l\'applicazione è andata in crash. Vuoi inviare una segnalazione\?</string>
 
@@ -249,22 +249,22 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informazione</string>
-    <string name="permissions_rationale_msg_storage">Riot deve essere autorizzato ad accedere alla tua Galleria di foto e video per poter inviare e salvare allegati.
+    <string name="permissions_rationale_msg_storage">Element deve essere autorizzato ad accedere alla tua Galleria di foto e video per poter inviare e salvare allegati.
 \n
 \nNel prossimo pop-up concedi l\'autorizzazione per poteri inviare file dal tuo dispositivo.</string>
-    <string name="permissions_rationale_msg_camera">Riot deve essere autorizzato ad accedere alla tua fotocamera per poter fare foto e video.</string>
+    <string name="permissions_rationale_msg_camera">Element deve essere autorizzato ad accedere alla tua fotocamera per poter fare foto e video.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nNel prossimo pop-up concedi l\'autorizzazione per poter fare la chiamata."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot deve essere autorizzato ad accedere al microfono e poter così fare chiamate audio.</string>
+    <string name="permissions_rationale_msg_record_audio">Element deve essere autorizzato ad accedere al microfono e poter così fare chiamate audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nNel prossimo pop-up concedi l\'autorizzazione per poter fare la chiamata."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot deve essere autorizzato ad accedere a fotocamera e microfono per poter fare chiamate video.
+    <string name="permissions_rationale_msg_camera_and_audio">Element deve essere autorizzato ad accedere a fotocamera e microfono per poter fare chiamate video.
 \n
 \nNel prossimo pop-up concedi le autorizzazioni per poter fare la chiamata.</string>
-    <string name="permissions_rationale_msg_contacts">Riot può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono. Se ti sta bene comunicare i dati di tutti i tuoi contatti all\'Identity Server, puoi concedere l\'autorizzazione nel prossimo pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono.
+    <string name="permissions_rationale_msg_contacts">Element può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono. Se ti sta bene comunicare i dati di tutti i tuoi contatti all\'Identity Server, puoi concedere l\'autorizzazione nel prossimo pop-up.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono.
 \n
 \nTi sta bene comunicare i dati di tutti i tuoi contatti per questo scopo\?</string>
 
@@ -672,7 +672,7 @@
     <string name="encryption_information_verify_device_warning2">Se non corrispondono, la sicurezza delle tue comunicazioni potrebbe essere compromessa.</string>
     <string name="encryption_information_verify_key_match">Ho verificato che le chiavi corrispondono</string>
 
-    <string name="e2e_enabling_on_app_update">Riot supporta ora la crittografia da-utente-a-utente, ma per abilitarla devi riconnetterti.
+    <string name="e2e_enabling_on_app_update">Element supporta ora la crittografia da-utente-a-utente, ma per abilitarla devi riconnetterti.
 \n
 \nPuoi farlo ora, o più tardi, dalle impostazioni dell\'applicazione.</string>
 
@@ -898,7 +898,7 @@
     <string name="settings_notification_privacy_message_content_not_shown">• Le notifiche <b>non mostreranno il contenuto del messaggio</b></string>
 
     <string name="startup_notification_privacy_title">Privacy delle notifiche</string>
-    <string name="startup_notification_privacy_message">Riot può esser sempre attivo in background in modo da gestire le tue notifiche in modo costante e sicuro. Ciò può influire sulla durata della batteria.</string>
+    <string name="startup_notification_privacy_message">Element può esser sempre attivo in background in modo da gestire le tue notifiche in modo costante e sicuro. Ciò può influire sulla durata della batteria.</string>
     <string name="startup_notification_privacy_button_grant">Concedi l\'autorizzazione</string>
     <string name="startup_notification_privacy_button_other">Scegli un\'altra opzione</string>
 
@@ -913,8 +913,8 @@
     <string name="settings_deactivate_my_account">Disattiva il mio account</string>
 
     <string name="settings_opt_in_of_analytics">Invia le statistiche di utilizzo</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot raccoglie statistiche anonime per permettere il miglioramento dell\'applicazione.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Attiva le statistiche per aiutare a migliorare Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element raccoglie statistiche anonime per permettere il miglioramento dell\'applicazione.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Attiva le statistiche per aiutare a migliorare Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Sì, voglio aiutare!</string>
 
     <string name="widget_integration_missing_parameter">Manca un parametro indispensabile.</string>
@@ -942,7 +942,7 @@
     <string name="e2e_re_request_encryption_key_sent">La richiesta della chiave è stata inviata.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Richiesta inviata</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Avvia Riot su un altro dispositivo che possa decifrare il messaggio, in modo che possa inviare le chiavi a questa sessione.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Avvia Element su un altro dispositivo che possa decifrare il messaggio, in modo che possa inviare le chiavi a questa sessione.</string>
 
     <string name="lock_screen_hint">Digita qui…</string>
 
@@ -1080,7 +1080,7 @@
     <string name="settings_show_avatar_display_name_changes_messages">Mostra i cambiamenti degli account</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Includi cambiamenti dell\'avatar e del nome visualizzato.</string>
     <string name="settings_password">Password</string>
-    <string name="settings_labs_native_camera_summary">Avvia la fotocamera di sistema invece della fotocamera di Riot.</string>
+    <string name="settings_labs_native_camera_summary">Avvia la fotocamera di sistema invece della fotocamera di Element.</string>
     <string name="settings_labs_enable_send_voice_summary">Questa opzione richiede un\'applicazione di terze parti per registrare i messaggi.</string>
 
     <string name="command_problem_with_parameters">Il comando \"%s\" necessita di più parametri, oppure alcuni parametri non sono corretti.</string>
@@ -1088,7 +1088,7 @@
     <string name="markdown_has_been_disabled">Markdown è stato disabilitato.</string>
 
     <string name="settings_call_category">Chiamate</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Usa la suoneria predefinita di Riot per le chiamate in arrivo</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Usa la suoneria predefinita di Element per le chiamate in arrivo</string>
     <string name="settings_call_ringtone_title">Suoneria delle chiamate in arrivo</string>
     <string name="settings_call_ringtone_dialog_title">Scegli la suoneria per le chiamate:</string>
 
@@ -1121,12 +1121,12 @@
     <string name="settings_troubleshoot_test_device_settings_title">Impostazioni sessione.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Le notifiche sono attive per questa sessione.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Le notifiche non sono attive per questa sessione. 
-\nControlla le impostazioni di Riot.</string>
+\nControlla le impostazioni di Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Abilita</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Esegui un controllo dei servizi</string>
     <string name="settings_troubleshoot_test_play_services_success">L\'APK Google Play Services è disponibile e aggiornato.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot usa Google Play Services per consegnare i messaggi a comparsa, ma sembra non sia stato configurato correttamente: 
+    <string name="settings_troubleshoot_test_play_services_failed">Element usa Google Play Services per consegnare i messaggi a comparsa, ma sembra non sia stato configurato correttamente:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Correggi i Play Services</string>
 
@@ -1152,25 +1152,25 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Esegui all\'avvio</string>
     <string name="settings_troubleshoot_test_service_boot_success">Il servizio inizierà quando il dispositivo sarà riavviato.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Il servizio non partirà al riavvio del dispositivo. Non riceverai notifiche finché Riot non verrà aperto almeno una volta.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Il servizio non partirà al riavvio del dispositivo. Non riceverai notifiche finché Element non verrà aperto almeno una volta.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Abilita l\'esecuzione all\'avvio</string>
 
-    <string name="settings_troubleshoot_test_bg_restricted_title">Verifica se Riot sia stato configurato per funzionare in modo limitato quando lavora in background</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Riot non funziona senza alcuna restrizione anche quando è eseguito in background. Questo test andrebbe eseguito usando dati mobili (non WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_title">Verifica se Element sia stato configurato per funzionare in modo limitato quando lavora in background</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Element non funziona senza alcuna restrizione anche quando è eseguito in background. Questo test andrebbe eseguito usando dati mobili (non WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Riot è stato configurato per funzionare in modo limitato quando è eseguito in background.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Element è stato configurato per funzionare in modo limitato quando è eseguito in background.
 \nIl funzionamento dell\'App, quando è eseguita in background, è stato fortemente limitato e ciò potrebbe influenzare la ricezione delle notifiche.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Non limitare</string>
 
     <string name="settings_troubleshoot_test_battery_title">Ottimizzazione della batteria</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot non è influenzato dall\'ottimizzazione della batteria.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element non è influenzato dall\'ottimizzazione della batteria.</string>
     <string name="settings_troubleshoot_test_battery_failed">Se si lascia un dispositivo scollegato, fermo e con lo schermo spento, dopo un certo tempo questo entra in modalità Doze. Ciò impedisce alle App di accedere alla rete e ritarda le attività, le sincronizzazioni e la ricezione dei normali allarmi.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignora l\'ottimizzazione</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Connessione in background</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Per poter ricevere le notifiche in tempo reale, Riot deve potersi sempre connettere. Anche quando funziona in background. 
-\nNella schermata successiva ti verrà chiesto di consentire a Riot di funzionare anche quando è in background, accetta per favore.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Per poter ricevere le notifiche in tempo reale, Element deve potersi sempre connettere. Anche quando funziona in background.
+\nNella schermata successiva ti verrà chiesto di consentire a Element di funzionare anche quando è in background, accetta per favore.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Concedi il permesso</string>
 
     <string name="account_email_error">Si è verificato un errore durante la verifica dell\'indirizzo email.</string>
@@ -1180,17 +1180,17 @@
 
     <string name="no_valid_google_play_services_apk">Non è stato trovato nessun APK Google Play Services valido. Le notifiche non funzioneranno correttamente.</string>
 
-    <string name="store_title">Riot.im - Comunica, a modo tuo</string>
+    <string name="store_title">Element - Comunica, a modo tuo</string>
     <string name="store_short_description">Una App per chat universali, sicure ed interamente sotto il tuo controllo.</string>
-    <string name="store_full_description">Una App per chat flessibile e interamente sotto il tuo controllo. Riot ti permette di comunicare a modo tuo. Creata per [matrix] - lo standard per le comunicazioni aperte, decentralizzate. 
+    <string name="store_full_description">Una App per chat flessibile e interamente sotto il tuo controllo. Element ti permette di comunicare a modo tuo. Creata per [matrix] - lo standard per le comunicazioni aperte, decentralizzate.
 \n 
 \nPuoi aprire un account matrix.org gratuito, creare il tuo server su https://modular.im o usare un altro server Matrix. 
 \n 
-\nPerché scegliere Riot.im\? 
+\nPerché scegliere Element\?
 \n 
 \n• COMUNICAZIONE COMPLETA: crea stanze per discussione pubbliche o private per i tuoi team, i tuoi amici, la tua comunità - come preferisci! Chatta, condividi file, aggiungi widget e fai chiamate video o audio - tutto gratuito. 
 \n 
-\n• GRANDI INTEGRAZIONI: collega Riot.im alle piattaforme che conosci ed ami. Con Riot.im puoi addirittura chattare con utenti e gruppi che usano altre App di chat. 
+\n• GRANDI INTEGRAZIONI: collega Element alle piattaforme che conosci ed ami. Con Element puoi addirittura chattare con utenti e gruppi che usano altre App di chat.
 \n 
 \n• PRIVATO E SICURO: tieni segrete le tue conversazioni. Una crittografia end-to-end allo stato dell\'arte assicura che le comunicazioni private restino sempre tali. 
 \n 
@@ -1200,7 +1200,7 @@
 
     <string name="video_call_in_progress">Chiamata video in corso…</string>
 
-    <string name="store_whats_new">Riot.im continua a crescere e migliorare. Il registro completo delle modifiche si può trovare qui: %1$s. Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi.</string>
+    <string name="store_whats_new">Element continua a crescere e migliorare. Il registro completo delle modifiche si può trovare qui: %1$s. Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi.</string>
     <string name="title_activity_keys_backup_setup">Backup delle chiavi</string>
     <string name="title_activity_keys_backup_restore">Usa il Backup delle chiavi</string>
     <string name="keys_backup_is_not_finished_please_wait">Il Backup delle chiavi non è concluso, attendere prego…</string>
@@ -1237,11 +1237,11 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Controlla le Impostazioni</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
-\nQuesto errore non dipende da Riot. Secondo Google dipende dal fatto che questo dispositivo ha troppe App registrate con FCM. L\'errore si verifica solo in casi in cui ci sia un numero estremo di app, quindi non dovrebbe affliggere l\'utente medio.</string>
+\nQuesto errore non dipende da Element. Secondo Google dipende dal fatto che questo dispositivo ha troppe App registrate con FCM. L\'errore si verifica solo in casi in cui ci sia un numero estremo di app, quindi non dovrebbe affliggere l\'utente medio.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s] 
-\nQuesto errore non dipende da Riot e può avere diverse cause. Potresti riprovare più tardi o controllare che Google Play Service non abbia configurato nelle Impostazioni di sistema dei limiti di utilizzo di dati. Anche un orologio di sistema regolato male potrebbe esserne la causa. Oppure può verificarsi se hai una ROM customizzata.</string>
+\nQuesto errore non dipende da Element e può avere diverse cause. Potresti riprovare più tardi o controllare che Google Play Service non abbia configurato nelle Impostazioni di sistema dei limiti di utilizzo di dati. Anche un orologio di sistema regolato male potrebbe esserne la causa. Oppure può verificarsi se hai una ROM customizzata.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
-\nQuesto errore non dipende da Riot. Non c\'è alcun account Google nel telefono. Apri il gestore di account ed aggiungi un account Google.</string>
+\nQuesto errore non dipende da Element. Non c\'è alcun account Google nel telefono. Apri il gestore di account ed aggiungi un account Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Aggiungi account</string>
 
     <string name="settings_noisy_notifications_preferences">Configura le notifiche rumorose</string>
@@ -1268,7 +1268,7 @@
     <string name="passphrase_empty_error_message">Inserisci una password</string>
     <string name="passphrase_passphrase_too_weak">La password è troppo debole</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Cancella la password se vuoi che Riot generi un codice di recupero.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Cancella la password se vuoi che Element generi un codice di recupero.</string>
     <string name="keys_backup_no_session_error">Non c\'è alcuna sessione Matrix disponibile</string>
 
     <string name="keys_backup_setup_step1_title">Non perdere mai i messaggi cifrati</string>
@@ -1400,7 +1400,7 @@
 
     <string name="autodiscover_invalid_response">Risposta Home Server non valida</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opzioni autocompletamento server</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot ha rilevato una configurazione server personalizzata per il tuo dominio userId \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element ha rilevato una configurazione server personalizzata per il tuo dominio userId \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Usa configurazione</string>
 
@@ -1538,7 +1538,7 @@
     <string name="group_all_communities">Tutte le comunità</string>
 
     <string name="room_preview_no_preview">Anteprima non disponibile per questa stanza</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">L\'anteprima di stanze leggibili da tutti non è ancora supportata in RiotX</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">L\'anteprima di stanze leggibili da tutti non è ancora supportata in Element</string>
 
     <string name="fab_menu_create_room">Stanze</string>
     <string name="fab_menu_create_chat">Messaggi diretti</string>
@@ -1555,7 +1555,7 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">Si è verificato un errore nell\'ottenere i dati dal Backup delle chiavi</string>
 
     <string name="alpha_disclaimer_title">Benvenuti nella beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Mentre RiotX si trova nella fase iniziale dello sviluppo, potrebbero mancare alcune funzioni e potrebbero verificarsi errori.</string>
+    <string name="alpha_disclaimer_content_line_1">Mentre Element si trova nella fase iniziale dello sviluppo, potrebbero mancare alcune funzioni e potrebbero verificarsi errori.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">L\'elenco di funzioni più recenti è sempre nel %1$s, se trovi errori ti preghiamo segnalarli nel menu in alto a sinistra della Pagina Iniziale e noi li correggeremo appena possibile.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Descrizione nel Play Store</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Se trovi errori ti preghiamo segnalarli nel menu in alto a sinistra della Pagina Iniziale e noi li correggeremo appena possibile.</string>
@@ -1597,15 +1597,15 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">Mostra gli eventi nascosti nella Timeline</string>
 
-    <string name="store_riotx_title">RiotX - Client Matrix di nuova generazione</string>
+    <string name="store_riotx_title">Element - Client Matrix di nuova generazione</string>
     <string name="store_riotx_short_description">Un client per Matrix più veloce e leggero che utilizza gli ultimi framework di Android</string>
-    <string name="store_riotx_full_description">RiotX è un nuovo client per il protocollo Matrix (Matrix.org): una rete aperta per comunicazioni sicure e decentralizzate. RiotX è stato completamente riscritto rispetto a Riot Android, ed è a sua volta basato su un SDK Android di Matrix totalmente riscritto. 
+    <string name="store_riotx_full_description">Element è un nuovo client per il protocollo Matrix (Matrix.org): una rete aperta per comunicazioni sicure e decentralizzate. Element è stato completamente riscritto rispetto a Riot Android, ed è a sua volta basato su un SDK Android di Matrix totalmente riscritto.
 \n 
-\nDisclaimer: questa è una versione beta. RiotX è attualmente in uno sviluppo attivo e contiene ancora alcune limitazioni ed errori (speriamo non troppi). I suggerimenti sono ben accetti! 
+\nDisclaimer: questa è una versione beta. Element è attualmente in uno sviluppo attivo e contiene ancora alcune limitazioni ed errori (speriamo non troppi). I suggerimenti sono ben accetti!
 \n 
-\nRiotX supporta: • Accesso ad account esistente • Crea stanze ed entra in stanze pubbliche • Accetta e rifiuta inviti • Elenca stanze utenti • Vedi dettagli stanza • Invia messaggi di testo • Invia allegati • Leggi e scrivi messaggi in stanze cifrate • Crypto: backup chiavi E2E, verifica avanzata dispositivi, richiesta e risposta condivisione chiavi • Notifiche push • Tema chiaro, scuro e nero 
+\nElement supporta: • Accesso ad account esistente • Crea stanze ed entra in stanze pubbliche • Accetta e rifiuta inviti • Elenca stanze utenti • Vedi dettagli stanza • Invia messaggi di testo • Invia allegati • Leggi e scrivi messaggi in stanze cifrate • Crypto: backup chiavi E2E, verifica avanzata dispositivi, richiesta e risposta condivisione chiavi • Notifiche push • Tema chiaro, scuro e nero
 \n 
-\nNon tutte le funzioni di Riot sono già implementate in RiotX. Principali funzioni mancanti (prossimamente!): • Impostazioni stanza (elenca membri stanza, ecc.) • Chiamate • Widget • …</string>
+\nNon tutte le funzioni di Element sono già implementate in Element. Principali funzioni mancanti (prossimamente!): • Impostazioni stanza (elenca membri stanza, ecc.) • Chiamate • Widget • …</string>
 
     <string name="room_list_catchup_empty_title">Non hai nulla di nuovo da vedere!</string>
     <string name="bottom_action_people_x">Messaggi diretti</string>
@@ -1658,7 +1658,7 @@
 
     <string name="widget_integration_review_terms">Per continuare devi accettare i termini di servizio.</string>
 
-    <string name="security_warning_identity_server">Alcune precedenti versioni di Riot contenevano un errore di sicurezza che permetteva al tuo Identity Server (%1$s) di accedere al tuo account. Se ti fidi di %2$s, puoi ignorare questo avviso; altrimenti disconnettiti e riaccedi di nuovo. 
+    <string name="security_warning_identity_server">Alcune precedenti versioni di Element contenevano un errore di sicurezza che permetteva al tuo Identity Server (%1$s) di accedere al tuo account. Se ti fidi di %2$s, puoi ignorare questo avviso; altrimenti disconnettiti e riaccedi di nuovo.
 \n 
 \nLeggi maggiori dettagli qui: 
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1692,11 +1692,11 @@
     <string name="invite_no_identity_server_error">Per poterlo fare, aggiungi un Identity Server nelle Impostazioni.</string>
     <string name="settings_background_fdroid_sync_mode">Modalità sync in background (Sperimentale)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Ottimizzato per la batteria</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot si sincronizzerà in background in modo da non consumare la poca batteria disponibile. 
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element si sincronizzerà in background in modo da non consumare la poca batteria disponibile.
 \nA seconda del livello della batteria, il sistema operativo potrebbe ritardare la sincronizzazione.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Ottimizzato per la performance</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot si sincronizzerà in background ad intervalli regolari (configurabili). 
-\nCiò avrà un certo impatto sulla quantità di dati e batteria utilizzati. Una notifica sempre accesa comunicherà che Riot è attivo.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element si sincronizzerà in background ad intervalli regolari (configurabili).
+\nCiò avrà un certo impatto sulla quantità di dati e batteria utilizzati. Una notifica sempre accesa comunicherà che Element è attivo.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Nessuna sincronizzazione in background</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Quando l\'App è in background non ti verranno notificati i messaggi in arrivo.</string>
     <string name="settings_background_sync_update_error">L\'aggiornamento delle impostazioni è fallito.</string>
@@ -1740,7 +1740,7 @@
     <string name="resources_script">Latn</string>
 
     <string name="labs_allow_extended_logging">Attiva i log dettagliati.</string>
-    <string name="labs_allow_extended_logging_summary">I log dettagliati aiuteranno gli sviluppatori fornendo loro molte più informazioni nelle segnalazioni che invii scuotendo il dispositivo. Anche se attivi i log dettagliati, Riot non registra mai i contenuti dei messaggi o altri dati personali.</string>
+    <string name="labs_allow_extended_logging_summary">I log dettagliati aiuteranno gli sviluppatori fornendo loro molte più informazioni nelle segnalazioni che invii scuotendo il dispositivo. Anche se attivi i log dettagliati, Element non registra mai i contenuti dei messaggi o altri dati personali.</string>
 
 
     <string name="error_terms_not_accepted">Riprova dopo avere accettato i termini di servizio del tuo Home Server.</string>
@@ -1800,14 +1800,14 @@
 \n
 \nSe non vuoi più vedere contenuti da questo utente, puoi bloccarlo per nascondere i suoi messaggi</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot richiede l\'autorizzazione per salvare le tue chiavi crittografiche sul disco. 
+    <string name="permissions_rationale_msg_keys_backup_export">Element richiede l\'autorizzazione per salvare le tue chiavi crittografiche sul disco.
 \n 
 \nPermetti l\'accesso nel prossimo pop-up per poter esportare le chiavi manualmente.</string>
 
     <string name="no_network_indicator">In questo momento non c\'è nessuna connessione di rete</string>
 
     <string name="settings_add_3pid_confirm_password_title">Conferma la tua password</string>
-    <string name="settings_add_3pid_flow_not_supported">Non puoi farlo da Riot mobile</string>
+    <string name="settings_add_3pid_flow_not_supported">Non puoi farlo da Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">E\'necessaria l\'autenticazione</string>
 
 
@@ -1880,18 +1880,18 @@
 
     <string name="login_continue">Continua</string>
     <string name="login_connect_to">Connetti a %1$s</string>
-    <string name="login_connect_to_modular">Connetti a Modular</string>
+    <string name="login_connect_to_modular">Connetti a Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Connetti ad un server personalizzato</string>
     <string name="login_signin_to">Accedi a %1$s</string>
     <string name="login_signup">Registrati</string>
     <string name="login_signin">Accedi</string>
     <string name="login_signin_sso">Continua con SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Indirizzo Modular</string>
+    <string name="login_server_url_form_modular_hint">Indirizzo Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Indirizzo</string>
     <string name="login_server_url_form_modular_text">Hosting premium per organizzazioni</string>
-    <string name="login_server_url_form_modular_notice">Inserisci l\'indirizzo del Riot Modular o del server che vuoi usare</string>
-    <string name="login_server_url_form_other_notice">Inserisci l\'indirizzo di un server o di un Riot a cui vuoi connetterti</string>
+    <string name="login_server_url_form_modular_notice">Inserisci l\'indirizzo del Element Modular o del server che vuoi usare</string>
+    <string name="login_server_url_form_other_notice">Inserisci l\'indirizzo di un server o di un Element a cui vuoi connetterti</string>
 
     <string name="login_sso_error_message">Si è verificato un errore caricando la pagina: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">L\'applicazione non riesce ad accedere a questo homeserver. L\'homeserver supporta i seguenti tipi di accesso: %1$s.
@@ -1964,7 +1964,7 @@
 \nFermare il processo di registrazione\?</string>
 
     <string name="login_a11y_choose_matrix_org">Seleziona matrix.org</string>
-    <string name="login_a11y_choose_modular">Seleziona Modular</string>
+    <string name="login_a11y_choose_modular">Seleziona Element Matrix Services</string>
     <string name="login_a11y_choose_other">Seleziona un server personalizzato</string>
     <string name="login_a11y_captcha_container">Completa la verifica Captcha</string>
     <string name="login_terms_title">Accetta le condizioni per continuare</string>
@@ -2010,7 +2010,7 @@
 \nRiaccedi per avere accesso ai dati dell\'account e ai messaggi.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Perderai l\'accesso ai messaggi sicuri a meno che non accedi per recuperare le tue chiavi di cifratura.</string>
     <string name="soft_logout_clear_data_dialog_submit">Elimina i dati</string>
-    <string name="soft_logout_sso_not_same_user_error">La sessione attuale è per l\'utente %1$s e hai fornito le credenziali per l\'utente %2$s. Ciò non è supportato da RiotX.
+    <string name="soft_logout_sso_not_same_user_error">La sessione attuale è per l\'utente %1$s e hai fornito le credenziali per l\'utente %2$s. Ciò non è supportato da Element.
 \nPrima elimina i dati, poi accedi di nuovo con un altro account.</string>
 
     <string name="permalink_malformed">Il tuo collegamento matrix.to non è corretto</string>
@@ -2033,7 +2033,7 @@
     <string name="autocomplete_limited_results">Mostrati solo i primi risultati, digita più lettere…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Crash facile</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX potrebbe crashare più spesso quando si verifica un errore imprevisto</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element potrebbe crashare più spesso quando si verifica un errore imprevisto</string>
     <string name="command_description_verify">Richiedi di verificare l\'ID utente in questione</string>
     <string name="command_description_shrug">Antepone ¯\\_(ツ)_/¯ ad un messaggio testuale</string>
 
@@ -2123,9 +2123,9 @@
 
     <string name="room_member_jump_to_read_receipt">Vai alla ricevuta di lettura</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX non gestisce eventi del tipo \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX non gestisce messaggi del tipo \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX ha riscontrato un errore con il rendering del contenuto dell\'evento con id \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element non gestisce eventi del tipo \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element non gestisce messaggi del tipo \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element ha riscontrato un errore con il rendering del contenuto dell\'evento con id \'%1$s\'</string>
 
     <string name="unignore">Non ignorare</string>
 
@@ -2255,7 +2255,7 @@
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Le chiavi sono già aggiornate!</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Richieste di chiavi</string>
 
@@ -2394,13 +2394,13 @@
     <string name="error_adding_media_file_to_gallery">Impossibile aggiungere il file multimediale alla galleria</string>
     <string name="change_password_summary">Imposta una nuova password dell\'account…</string>
 
-    <string name="use_other_session_content_description">Usa l\'ultima versione di Riot sui tuoi altri dispositivi, Riot Web, Riot Desktop, Riot iOS, RiotX per Android o un altro client Matrix che supporti la firma incrociata</string>
-    <string name="riot_desktop_web">Riot Web
-\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X per Android</string>
+    <string name="use_other_session_content_description">Usa l\'ultima versione di Element sui tuoi altri dispositivi, Element Web, Element Desktop, Element iOS, Element per Android o un altro client Matrix che supporti la firma incrociata</string>
+    <string name="riot_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="riot_ios_android">Element iOS
+\nElement per Android</string>
     <string name="or_other_mx_capabale_client">o un altro client Matrix che supporti la firma incrociata</string>
-    <string name="use_latest_riot">Usa l\'ultimo Riot sui tuoi altri dispositivi:</string>
+    <string name="use_latest_riot">Usa l\'ultimo Element sui tuoi altri dispositivi:</string>
     <string name="command_description_discard_session">Forza l\'attuale sessione di gruppo in uscita in una stanza cifrata ad essere scartata</string>
     <string name="command_description_discard_session_not_handled">Supportato solo nelle stanze cifrate</string>
     <string name="enter_secret_storage_passphrase_or_key">Usa la tua %1$s o la %2$s per continuare.</string>
@@ -2472,11 +2472,11 @@
 
     <string name="open_terms_of">Apri condizioni di %s</string>
     <string name="disconnect_identity_server_dialog_content">Disconnettere dal server di identitià %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Questo server di identità è obsoleto. RiotX supporta solo API V2.</string>
+    <string name="identity_server_error_outdated_identity_server">Questo server di identità è obsoleto. Element supporta solo API V2.</string>
     <string name="identity_server_error_outdated_home_server">Questa operazione non è possibile. L\'homeserver è obsoleto.</string>
     <string name="identity_server_error_no_identity_server_configured">Prima configura un server di identità.</string>
     <string name="identity_server_error_terms_not_signed">Prima accetta le condizioni del server di identità nelle impostazioni.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, RiotX supporta solo l\'invio di email utente e numeri di telefono in formato hash.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, Element supporta solo l\'invio di email utente e numeri di telefono in formato hash.</string>
     <string name="identity_server_error_binding_error">L\'associamento è fallito.</string>
     <string name="identity_server_error_no_current_binding_error">Non c\'è alcun associamento attuale con questo identificativo.</string>
 
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 69d08a7524..9de542a9a6 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -324,7 +324,7 @@
     <string name="option_take_photo_video">写真または動画を撮影</string>
 
     <string name="auth_send_reset_email">初期化メール送信</string>
-    <string name="permissions_rationale_msg_camera">写真撮影やビデオ通話には, Riotアプリに端末のカメラの使用を許可する必要があります.</string>
+    <string name="permissions_rationale_msg_camera">写真撮影やビデオ通話には, Elementアプリに端末のカメラの使用を許可する必要があります.</string>
     <string name="cannot_start_call">通話を開始できませんでした。後ほど試してください。</string>
     <string name="missing_permissions_warning">権限が無いため、一部の機能を利用できない可能性があります…</string>
     <string name="missing_permissions_to_start_conf_call">この部屋で会議を開始するためには招待権限が必要です</string>
@@ -332,7 +332,7 @@
     <string name="action_sign_out">ログアウト</string>
     <string name="bottom_action_home">ホーム</string>
     <string name="no_conversation_placeholder">会話なし</string>
-    <string name="no_contact_access_placeholder">端末の電話帳をRiotアプリが読み取ることは許可されていません</string>
+    <string name="no_contact_access_placeholder">端末の電話帳をElementアプリが読み取ることは許可されていません</string>
     <string name="no_result_placeholder">結果なし</string>
 
     <string name="rooms_header">部屋</string>
@@ -507,25 +507,25 @@
     <string name="matrix_only_filter">Matrixの連絡先のみ</string>
     <string name="call_error_user_not_responding">通信先が通話の受取に失敗しました。</string>
     <string name="permissions_rationale_popup_title">情報</string>
-    <string name="permissions_rationale_msg_storage">Riotは添付ファイルを送信および保存するために写真とビデオライブラリにアクセスするための許可が必要です。
+    <string name="permissions_rationale_msg_storage">Elementは添付ファイルを送信および保存するために写真とビデオライブラリにアクセスするための許可が必要です。
 
 あなたの携帯端末からファイルを送信できるようにするには、次のポップアップでアクセスを許可してください。</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 通話をするには、次のポップアップでアクセスできるように設定してください。</string>
-    <string name="permissions_rationale_msg_record_audio">Riotアプリは、音声通話を実行するためにマイクへアクセスするための許可が必要です。</string>
+    <string name="permissions_rationale_msg_record_audio">Elementアプリは、音声通話を実行するためにマイクへアクセスするための許可が必要です。</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 通話をするには、次のポップアップでアクセスできるようにしてください。</string>
-    <string name="permissions_rationale_msg_camera_and_audio">ビデオ通話を行うには、カメラとマイクにアクセスするための権限がRiotアプリに必要です。
+    <string name="permissions_rationale_msg_camera_and_audio">ビデオ通話を行うには、カメラとマイクにアクセスするための権限がElementアプリに必要です。
 
 通話をするには、次のポップアップでのアクセスを許可してください。</string>
-    <string name="permissions_rationale_msg_contacts">Matrixユーザが電子メールアドレスや電話番号を元に他のユーザを検索するためには、Riotアプリがあなたの端末内電話帳へアクセスする許可が必要です。
+    <string name="permissions_rationale_msg_contacts">Matrixユーザが電子メールアドレスや電話番号を元に他のユーザを検索するためには、Elementアプリがあなたの端末内電話帳へアクセスする許可が必要です。
 
-Riotからあなた個人の電話帳への検索要求を許可する場合は、次のポップアップでアクセスを許可してください。</string>
-    <string name="permissions_msg_contacts_warning_other_androids">あなた個人の端末内の電話帳に登録されている電子メールアドレス、電話番号を元に、Riotの利用者を検索する場合は、アプリが端末内電話帳へアクセスする許可が必要です。
+Elementからあなた個人の電話帳への検索要求を許可する場合は、次のポップアップでアクセスを許可してください。</string>
+    <string name="permissions_msg_contacts_warning_other_androids">あなた個人の端末内の電話帳に登録されている電子メールアドレス、電話番号を元に、Elementの利用者を検索する場合は、アプリが端末内電話帳へアクセスする許可が必要です。
 
-Riotアプリがあなたの電話帳へアクセスすることを許可しますか？</string>
+Elementアプリがあなたの電話帳へアクセスすることを許可しますか？</string>
 
     <string name="permissions_action_not_performed_missing_permissions">申し訳ありません。権限がないために操作が実行されませんでした</string>
 
@@ -554,7 +554,7 @@ Riotアプリがあなたの電話帳へアクセスすることを許可しま
 不明なデバイス:</string>
 
     <string name="unknown_devices_alert_title">部屋に不明なデバイスが含まれています</string>
-    <string name="e2e_enabling_on_app_update">Riotはエンドツーエンドの暗号化をサポートするようになりましたが、有効にするには再度ログインする必要があります。
+    <string name="e2e_enabling_on_app_update">Elementはエンドツーエンドの暗号化をサポートするようになりましたが、有効にするには再度ログインする必要があります。
 
 アプリケーションの設定から今すぐまたは後で行うことができます。</string>
 
@@ -830,7 +830,7 @@ Riotアプリがあなたの電話帳へアクセスすることを許可しま
     <string name="e2e_re_request_encryption_key_sent">鍵のリクエストが送信されました。</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">リクエスト送信済</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">鍵をこのデバイスに送信できるように、メッセージを復号化できる他のデバイスでRiotを起動してください。</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">鍵をこのデバイスに送信できるように、メッセージを復号化できる他のデバイスでElementを起動してください。</string>
 
     <plurals name="format_time_s">
         <item quantity="other">%d 秒</item>
@@ -869,13 +869,13 @@ Riotアプリがあなたの電話帳へアクセスすることを許可しま
     <string name="settings_deactivate_my_account">自分のアカウントを停止</string>
 
     <string name="startup_notification_privacy_title">通知のプライバシー</string>
-    <string name="startup_notification_privacy_message">Riotは通知を安全で内密に扱うため、バックグラウンドで動作できます。これによりバッテリー使用に影響が出ることがあります。</string>
+    <string name="startup_notification_privacy_message">Elementは通知を安全で内密に扱うため、バックグラウンドで動作できます。これによりバッテリー使用に影響が出ることがあります。</string>
     <string name="startup_notification_privacy_button_grant">許可を与える</string>
     <string name="startup_notification_privacy_button_other">他のオプションを選択</string>
 
     <string name="settings_opt_in_of_analytics">解析データを送信</string>
-    <string name="settings_opt_in_of_analytics_summary">Riotはアプリを改善するため、匿名の解析データを収集します。</string>
-    <string name="settings_opt_in_of_analytics_prompt">Riotを改善するのを助けるため、解析を許可してください。</string>
+    <string name="settings_opt_in_of_analytics_summary">Elementはアプリを改善するため、匿名の解析データを収集します。</string>
+    <string name="settings_opt_in_of_analytics_prompt">Elementを改善するのを助けるため、解析を許可してください。</string>
     <string name="settings_opt_in_of_analytics_ok">はい、助けたいです！</string>
 
     <string name="settings_without_flair">あなたは現在どのコミュニティーのメンバーでもありません。</string>
@@ -991,7 +991,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="auth_accept_policies">このホームサーバーの方針を閲覧し承認してください:</string>
 
     <string name="settings_call_category">通話設定画面</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">着信にRiotの既定の着信音を使う</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">着信にElementの既定の着信音を使う</string>
     <string name="settings_call_ringtone_title">着信音</string>
     <string name="settings_call_ringtone_dialog_title">着信音を選んでください:</string>
 
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 3b3d4ec09a..33e179149d 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -137,7 +137,7 @@
     <string name="done">완료</string>
     <string name="action_sign_out_confirmation_simple">정말 로그아웃하시겠어요\?</string>
     <string name="action_mark_room_read">읽음으로 표시</string>
-    <string name="no_contact_access_placeholder">Riot이 연락처에 접근할 수 없게 되어 있습니다</string>
+    <string name="no_contact_access_placeholder">Element이 연락처에 접근할 수 없게 되어 있습니다</string>
     <plurals name="public_room_nb_users">
         <item quantity="other">%d명의 사용자</item>
     </plurals>
@@ -274,7 +274,7 @@
     <string name="e2e_re_request_encryption_key_sent">키 요청을 보냈습니다.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">요청 보냄</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">다른 기기에서 Riot을 설치해서 메시지를 암호화하고 이 기기로 키를 보내도록 합니다.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">다른 기기에서 Element을 설치해서 메시지를 암호화하고 이 기기로 키를 보내도록 합니다.</string>
 
     <string name="read_receipts_list">읽은 기록 읽기</string>
 
@@ -302,7 +302,7 @@
     <string name="room_info_room_topic">방 주제</string>
 
     <string name="settings_call_category">전화</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">수신 전화에 Riot 기본 벨소리를 사용합니다</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">수신 전화에 Element 기본 벨소리를 사용합니다</string>
     <string name="settings_call_ringtone_title">수신 전화 벨소리</string>
     <string name="settings_call_ringtone_dialog_title">전화에 사용할 벨소리를 선택하세요:</string>
 
@@ -326,22 +326,22 @@
     <string name="media_picker_cannot_record_video">영상을 촬영할 수 없음</string>
 
     <string name="permissions_rationale_popup_title">정보</string>
-    <string name="permissions_rationale_msg_storage">첨부 파일을 보내고 저장하려면 Riot은 영상과 사진 보관함에 접근하는 권한이 필요합니다.
+    <string name="permissions_rationale_msg_storage">첨부 파일을 보내고 저장하려면 Element은 영상과 사진 보관함에 접근하는 권한이 필요합니다.
 \n
 \n당신의 휴대 전화에서 파일을 보내려면 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_rationale_msg_camera">사진을 찍고 영상 통화를 하려면 Riot은 카메라에 접근하는 권한이 필요합니다.</string>
+    <string name="permissions_rationale_msg_camera">사진을 찍고 영상 통화를 하려면 Element은 카메라에 접근하는 권한이 필요합니다.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요."</string>
-    <string name="permissions_rationale_msg_record_audio">음성 통화를 하려면 Riot은 마이크에 접근하는 권한이 필요합니다.</string>
+    <string name="permissions_rationale_msg_record_audio">음성 통화를 하려면 Element은 마이크에 접근하는 권한이 필요합니다.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">영상 통화를 하려면 Riot은 카메라와 마이크에 접근하는 권한이 필요합니다.
+    <string name="permissions_rationale_msg_camera_and_audio">영상 통화를 하려면 Element은 카메라와 마이크에 접근하는 권한이 필요합니다.
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_rationale_msg_contacts">Riot은 당신의 연락처를 확인해서 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 이런 이유로 연락처를 공유하는 것을 허용한다면, 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">"Riot은  당신의 연락처를 확인하여 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 
+    <string name="permissions_rationale_msg_contacts">Element은 당신의 연락처를 확인해서 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 이런 이유로 연락처를 공유하는 것을 허용한다면, 다음 팝업에서 접근을 허용해주세요.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">"Element은  당신의 연락처를 확인하여 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다.
 \n 
 \n이런 이유로 연락처를 공유하는 것을 허용하겠습니까\?"</string>
 
@@ -581,7 +581,7 @@
     <string name="settings_troubleshoot_test_device_settings_title">기기 설정.</string>
     <string name="settings_troubleshoot_test_device_settings_success">알림이 이 기기에서 켜집니다.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">알림이 이 기기에서 허용되지 않습니다.
-\nRiot 설정을 확인해주세요.</string>
+\nElement 설정을 확인해주세요.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">켜기</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">맞춤 설정.</string>
@@ -592,7 +592,7 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play 서비스 확인</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 서비스 APK는 최신 버전입니다.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot은 Google Play 서비스를 사용해 푸시 메시지를 보내지만 올바르게 설정되지 않은 모양입니다:
+    <string name="settings_troubleshoot_test_play_services_failed">Element은 Google Play 서비스를 사용해 푸시 메시지를 보내지만 올바르게 설정되지 않은 모양입니다:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play 서비스 고치기</string>
 
@@ -602,11 +602,11 @@
     <string name="settings_troubleshoot_test_fcm_failed">FCM 토큰을 검색하는데 실패했습니다:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\n이 오류는 Riot의 통제 밖에 있으며 Google과 관련이 있습니다, 이 오류는 기기가 FCM에 등록된 앱이 너무 많다는 것을 나타냅니다. 오류는 수 많은 앱이 있는 경우에만 발생하고, 일반 사용자에게 영향을 미치지 않아야 합니다.</string>
+\n이 오류는 Element의 통제 밖에 있으며 Google과 관련이 있습니다, 이 오류는 기기가 FCM에 등록된 앱이 너무 많다는 것을 나타냅니다. 오류는 수 많은 앱이 있는 경우에만 발생하고, 일반 사용자에게 영향을 미치지 않아야 합니다.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\n이 오류는 Riot의 통제 밖입니다. 여러 이유로 발생할 수 있습니다. 나중에 다시 시도하면 작동할 지도 모릅니다, 시스템 설정에서 Google Play 서비스의 데이터 사용이 제한되었는지, 기기의 시간은 맞는 지 확인해보세요, 혹은 커스텀 롬 환경에서 발생할 수 있습니다.</string>
+\n이 오류는 Element의 통제 밖입니다. 여러 이유로 발생할 수 있습니다. 나중에 다시 시도하면 작동할 지도 모릅니다, 시스템 설정에서 Google Play 서비스의 데이터 사용이 제한되었는지, 기기의 시간은 맞는 지 확인해보세요, 혹은 커스텀 롬 환경에서 발생할 수 있습니다.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\n이 오류는 Riot의 통제 밖에 있습니다. 휴대 전화에 Google 계정이 없습니다. 계정 관리자를 열어 Google 계정을 추가하세요.</string>
+\n이 오류는 Element의 통제 밖에 있습니다. 휴대 전화에 Google 계정이 없습니다. 계정 관리자를 열어 Google 계정을 추가하세요.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">계정 추가</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">토큰 등록</string>
@@ -626,19 +626,19 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">부팅 시 시작</string>
     <string name="settings_troubleshoot_test_service_boot_success">기기가 다시 시작되면 서비스가 시작됩니다.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">기기가 다시 시작될 때 서비스가 시작되지 않습니다, 다시 시작한 후 Riot을 한 번이라도 열지 않으면 알림을 받을 수 없습니다.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">기기가 다시 시작될 때 서비스가 시작되지 않습니다, 다시 시작한 후 Element을 한 번이라도 열지 않으면 알림을 받을 수 없습니다.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">부팅 시 시작 활성화</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">백그라운드 제한 사항 확인</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Riot에 대한 백그라운드 제한 사항을 비활성화합니다. 이 테스트는 모바일 데이터를 사용해야 합니다 (WIFI 없음).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Element에 대한 백그라운드 제한 사항을 비활성화합니다. 이 테스트는 모바일 데이터를 사용해야 합니다 (WIFI 없음).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Riot에 대한 백그라운드 제한 사항이 활성화됩니다.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Element에 대한 백그라운드 제한 사항이 활성화됩니다.
 \n앱이 백그라운드에서 작업하는 동안 앱이 시도하는 작업은 적극적으로 제한되며, 이는 알림에 영향을 줄 수 있습니다.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">제한 사항 비활성화</string>
 
     <string name="settings_troubleshoot_test_battery_title">배터리 최적화</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot은 배터리 최적화의 영향을 받지 않습니다.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element은 배터리 최적화의 영향을 받지 않습니다.</string>
     <string name="settings_troubleshoot_test_battery_failed">사용자가 기기 화면을 끈 상태로 일정 시간 동안 연결되지 않은 상태로 두면, 기기는 Doze 모드에 들어갑니다. 이렇게 하면 앱이 네트워크에 접근하지 못하고 작업, 동기화 및 표준 경보가 지연됩니다.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">최적화 무시하기</string>
 
@@ -726,19 +726,19 @@
     <string name="settings_deactivate_my_account">내 계정 비활성화</string>
 
     <string name="startup_notification_privacy_title">알림 개인 정보</string>
-    <string name="startup_notification_privacy_message">Riot은 백그라운드에서 실행되어 알림을 안전하고 은밀하게 관리할 수 있습니다. 이것은 배터리 사용량에 영향을 줄 수 있습니다.</string>
+    <string name="startup_notification_privacy_message">Element은 백그라운드에서 실행되어 알림을 안전하고 은밀하게 관리할 수 있습니다. 이것은 배터리 사용량에 영향을 줄 수 있습니다.</string>
     <string name="startup_notification_privacy_button_grant">권한 부여</string>
     <string name="startup_notification_privacy_button_other">다른 설정을 선택하세요</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">백그라운드 연결</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot은 신뢰가 있는 알림을 위해 낮은 영향의 백그라운드 연결을 유지해야 합니다.
-\n다른 화면에서 Riot이 항상 백그라운드에서 실행하도록 허용하는 메시지가 표시됩니다, 수락해주세요.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element은 신뢰가 있는 알림을 위해 낮은 영향의 백그라운드 연결을 유지해야 합니다.
+\n다른 화면에서 Element이 항상 백그라운드에서 실행하도록 허용하는 메시지가 표시됩니다, 수락해주세요.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">권한 부여</string>
 
     <string name="settings_analytics">정보 분석</string>
     <string name="settings_opt_in_of_analytics">정보 분석 데이터 보내기</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot은 애플리케이션을 개선할 수 있도록 익명의 분석을 수집합니다.</string>
-    <string name="settings_opt_in_of_analytics_prompt">분석을 활성화해서 Riot이 개선할 수 있도록 도와주세요.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element은 애플리케이션을 개선할 수 있도록 익명의 분석을 수집합니다.</string>
+    <string name="settings_opt_in_of_analytics_prompt">분석을 활성화해서 Element이 개선할 수 있도록 도와주세요.</string>
     <string name="settings_opt_in_of_analytics_ok">예, 저도 돕고 싶습니다!</string>
 
     <string name="settings_data_save_mode">데이터 절약 모드</string>
@@ -946,7 +946,7 @@
     <string name="encryption_information_verify_device_warning2">그것이 맞다면, 아래의 확인 버튼을 누르세요. 맞지 않다면, 다른 사람이 이 기기를 가로채고 있는 것이고 블랙리스트에 올려야 합니다. 앞으로 이 확인 절차는 더 정교해질 것입니다.</string>
     <string name="encryption_information_verify_key_match">키가 맞다는 것은 확인합니다</string>
 
-    <string name="e2e_enabling_on_app_update">Riot은 이제 종단간 암호화를 지원하지만 활성화하려면 다시 로그인해야 합니다.
+    <string name="e2e_enabling_on_app_update">Element은 이제 종단간 암호화를 지원하지만 활성화하려면 다시 로그인해야 합니다.
 \n
 \n지금 바로 하거나 나중에 애플리케이션 설정에서 할 수 있습니다.</string>
 
@@ -1169,18 +1169,18 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">올바른 Google Play 서비스 APK를 찾을 수 없습니다. 알림이 제대로 작동하지 않을 수 있습니다.</string>
 
-    <string name="store_title">Riot.im - 대화하세요, 나만의 방식</string>
-    <string name="store_whats_new">우리는 항상 Riot.im을 변경하고 개선하고 있습니다. 전체 변경 내역은 여기서 찾을 수 있습니다: %1$s. 놓치지 않도록 업데이트를 켜 놓아주세요.</string>
+    <string name="store_title">Element - 대화하세요, 나만의 방식</string>
+    <string name="store_whats_new">우리는 항상 Element을 변경하고 개선하고 있습니다. 전체 변경 내역은 여기서 찾을 수 있습니다: %1$s. 놓치지 않도록 업데이트를 켜 놓아주세요.</string>
     <string name="store_short_description">전적으로 여러분의 통제 하에 있는 범용 보안 대화 앱.</string>
-    <string name="store_full_description">여러분의 통제 하에 완전히 유연한 대화 앱. Riot은 여러분이 원하는 방식으로 대화할 수 있도록 합니다. 개방형 분산 커뮤니티의 표준 - [matrix]를 위해 제작됨. 
+    <string name="store_full_description">여러분의 통제 하에 완전히 유연한 대화 앱. Element은 여러분이 원하는 방식으로 대화할 수 있도록 합니다. 개방형 분산 커뮤니티의 표준 - [matrix]를 위해 제작됨.
 \n 
 \n무료 matrix.org 계정을 만들고, https://modular.im 에서 자신만의 서버, 혹은 다른 Matrix 서버를 얻으세요. 
 \n 
-\n왜 Riot.im을 선택해야 하나요\? 
+\n왜 Element을 선택해야 하나요\?
 \n 
 \n• 완전한 대화: 원하는 대로 팀이나 친구, 커뮤니티를 중심으로 방을 만드세요! 대화, 파일 공유, 위젯 추가와 음성 및 영상 통화 - 모두 무료입니다. 
 \n 
-\n• 강력한 통합: 여러분이 알고 사랑하는 도구와 함께 Riot.im을 사용하세요. Riot.im이라면 다른 대화 앱의 사용자와 그룹까지도 대화할 수 있습니다. 
+\n• 강력한 통합: 여러분이 알고 사랑하는 도구와 함께 Element을 사용하세요. Element이라면 다른 대화 앱의 사용자와 그룹까지도 대화할 수 있습니다.
 \n 
 \n• 개인 및 보안: 대화를 비밀로 유지하세요. 최첨단 종단간 암호화로 비밀 대화를 은밀하게 유지해줍니다. 
 \n 
@@ -1195,7 +1195,7 @@
     <string name="passphrase_empty_error_message">암호를 입력하세요</string>
     <string name="passphrase_passphrase_too_weak">암호가 너무 약합니다</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Riot으로 복구 키를 생성하려면 암호를 지워주세요.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Element으로 복구 키를 생성하려면 암호를 지워주세요.</string>
     <string name="keys_backup_no_session_error">이용할 수 있는 Matrix 세션이 없음</string>
 
     <string name="keys_backup_setup_step1_title">암호화된 메시지를 잃지 마세요</string>
@@ -1330,7 +1330,7 @@
 
     <string name="autodiscover_invalid_response">잘못된 홈서버 검색 응답</string>
     <string name="autodiscover_well_known_autofill_dialog_title">자동 완성 서버 설정</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot이 userId 도메인 \"%1$s\"에 대한 맞춤 서버 설정을 감지했습니다:
+    <string name="autodiscover_well_known_autofill_dialog_message">Element이 userId 도메인 \"%1$s\"에 대한 맞춤 서버 설정을 감지했습니다:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">설정 사용</string>
 
@@ -1420,7 +1420,7 @@
     <string name="group_all_communities">모든 커뮤니티</string>
 
     <string name="room_preview_no_preview">이 방은 미리 볼 수 없습니다</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">세계가 읽을 수 있는 방의 미리보기는 아직 RiotX에서 지원하지 않습니다</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">세계가 읽을 수 있는 방의 미리보기는 아직 ElementX에서 지원하지 않습니다</string>
 
     <string name="fab_menu_create_room">방</string>
     <string name="fab_menu_create_chat">다이렉트 메시지</string>
@@ -1437,7 +1437,7 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">키 백업 데이터를 얻는 과정에서 오류가 발생했습니다</string>
 
     <string name="alpha_disclaimer_title">베타 버전에 온 것을 환영합니다!</string>
-    <string name="alpha_disclaimer_content_line_1">RiotX가 개발 중에 있기에, 일부 기능이 부족하고 버그가 나올 수 있습니다.</string>
+    <string name="alpha_disclaimer_content_line_1">ElementX가 개발 중에 있기에, 일부 기능이 부족하고 버그가 나올 수 있습니다.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">최신 기능 목록은 항상 %1$s에 있고, 버그를 발견했다면 홈의 왼쪽 위 메뉴에서 신고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play 스토어 설명</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">버그를 발견했다면 홈의 왼쪽 위 메뉴에서 신고해주세요, 그러면 가능한 한 빨리 고치겠습니다.</string>
@@ -1479,15 +1479,15 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">타임라인에서 숨겨진 이벤트 보이기</string>
 
-    <string name="store_riotx_title">RiotX - 차세대 Matrix 클라이언트</string>
+    <string name="store_riotx_title">Element - 차세대 Matrix 클라이언트</string>
     <string name="store_riotx_short_description">최신 안드로이드 프레임워크를 사용해 더 빠르고 가벼운 Matrix를 위한 클라이언트</string>
-    <string name="store_riotx_full_description">RiotX는 Matrix 프로토콜 (Matrix.org)을 위한 새 클라이언트입니다: 안전한 분산 통신을 위한 개방형 네트워크. RiotX는 Matrix 안드로이드 SDK의 Riot 안드로이드 클라이언트 전체 개정판을 기반으로 한 Riot 안드로이드 클라이언트의 전체 개정판입니다. 
+    <string name="store_riotx_full_description">Element는 Matrix 프로토콜 (Matrix.org)을 위한 새 클라이언트입니다: 안전한 분산 통신을 위한 개방형 네트워크. Element는 Matrix 안드로이드 SDK의 Element 안드로이드 클라이언트 전체 개정판을 기반으로 한 Riot 안드로이드 클라이언트의 전체 개정판입니다.
 \n 
-\n면책 조항: 이것은 베타 버전입니다. RiotX는 현재 개발 중이고 한계가 있으며 (많지 않으면 좋겠지만) 버그가 있습니다. 모든 피드백은 환영합니다! 
+\n면책 조항: 이것은 베타 버전입니다. Element는 현재 개발 중이고 한계가 있으며 (많지 않으면 좋겠지만) 버그가 있습니다. 모든 피드백은 환영합니다!
 \n 
-\nRiotX 지원: • 존재하는 계정으로 로그인 • 방을 만들고 공공 방에 참가 • 초대를 수락하거나 거절 • 사용자 방 목록 • 방 세부 정보 보기 • 문자 메시지 보내기 • 첨부 파일 보내기 • 암호화된 방에서 메시지 읽고 쓰기 • 암호화: 종단간 암호화 키 백업, 고급 기기 확인, 키 공유 요청과 답장 • 푸시 알림 • 밝은 테마, 어두운 테마 그리고 검정 테마 
+\nElement 지원: • 존재하는 계정으로 로그인 • 방을 만들고 공공 방에 참가 • 초대를 수락하거나 거절 • 사용자 방 목록 • 방 세부 정보 보기 • 문자 메시지 보내기 • 첨부 파일 보내기 • 암호화된 방에서 메시지 읽고 쓰기 • 암호화: 종단간 암호화 키 백업, 고급 기기 확인, 키 공유 요청과 답장 • 푸시 알림 • 밝은 테마, 어두운 테마 그리고 검정 테마
 \n 
-\n아직 Riot의 모든 기능이 RiotX에 구현되지 않았습니다. 주요 없는 (그리고 곧 나올!) 기능: • 방 설정 (방 구성원 목록 등) • 전화 • 위젯 • …</string>
+\n아직 Element의 모든 기능이 Element에 구현되지 않았습니다. 주요 없는 (그리고 곧 나올!) 기능: • 방 설정 (방 구성원 목록 등) • 전화 • 위젯 • …</string>
 
     <string name="bottom_action_people_x">다이렉트 메시지</string>
 
@@ -1536,7 +1536,7 @@
 
     <string name="widget_integration_review_terms">계속 하려면 이 서비스 약관에 동의해야 합니다.</string>
 
-    <string name="security_warning_identity_server">Riot의 이전 버전은 보안 버그로 ID 서버 (%1$s)가 계정으로 접근할 수 있었습니다. %2$s을(를) 신뢰하면 이것을 무시하고, 그렇지 않다면 로그아웃한 후 다시 로그인하세요.
+    <string name="security_warning_identity_server">Element의 이전 버전은 보안 버그로 ID 서버 (%1$s)가 계정으로 접근할 수 있었습니다. %2$s을(를) 신뢰하면 이것을 무시하고, 그렇지 않다면 로그아웃한 후 다시 로그인하세요.
 \n
 \n자세한 설명은 여기서 읽으세요:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1570,11 +1570,11 @@
     <string name="invite_no_identity_server_error">이 작업을 하려면 설정에서 ID 서버를 추가하세요.</string>
     <string name="settings_background_fdroid_sync_mode">백그라운드 동기화 모드 (실험적)</string>
     <string name="settings_background_fdroid_sync_mode_battery">배터리에 최적화됨</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot은 기기의 제한된 자원 (배터리)을 유지하기 위해 백그라운드에서 동기화합니다.
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element은 기기의 제한된 자원 (배터리)을 유지하기 위해 백그라운드에서 동기화합니다.
 \n기기 자원 상태에 따라 운영체제에 의해 동기화는 지연될 수 있습니다.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">실시간으로 최적화됨</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot은 (설정할 수 있는) 특정 시간에 주기적으로 백그라운드에거 동기화됩니다.
-\n이는 라디오와 배터리 사용에 영향을 주며 Riot이 이벤트를 수신하고 있는 상태라는 알림이 영구적으로 표시됩니다.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element은 (설정할 수 있는) 특정 시간에 주기적으로 백그라운드에거 동기화됩니다.
+\n이는 라디오와 배터리 사용에 영향을 주며 Element이 이벤트를 수신하고 있는 상태라는 알림이 영구적으로 표시됩니다.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">백그라운드 동기화 없음</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">앱이 백그라운드에 있을 때 수신 메시지의 알림을 받지 않습니다.</string>
     <string name="settings_background_sync_update_error">설정을 업데이트하는데 실패했습니다.</string>
@@ -1677,7 +1677,7 @@
 \n
 \n이 사용자의 내용을 더 이상 보고 싶지 않다면, 사용자를 차단하거나 메시지를 감출 수 있습니다</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot은 종단간 키를 디스크에 저장하려면 권한이 필요합니다.
+    <string name="permissions_rationale_msg_keys_backup_export">Element은 종단간 키를 디스크에 저장하려면 권한이 필요합니다.
 \n
 \n키를 수동으로 내보내려면 다음 팝업에서 접근을 허용해주세요.</string>
 
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 9b6a7b38fd..6c80e1ba97 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -75,7 +75,7 @@
     <string name="local_address_book_header">Vietējā adrešu grāmata</string>
     <string name="matrix_only_filter">Vienīgi Matrix kontakti</string>
     <string name="no_conversation_placeholder">Nav sarunu</string>
-    <string name="no_contact_access_placeholder">Tu neesi atļāvis/usi Riot piekļūt taviem vietējiem kontaktiem</string>
+    <string name="no_contact_access_placeholder">Tu neesi atļāvis/usi Element piekļūt taviem vietējiem kontaktiem</string>
     <string name="no_result_placeholder">Nav rezultātu</string>
 
     <string name="rooms_header">Istabas</string>
@@ -261,27 +261,27 @@ Tu esi izrakstīts no visām ierīcēm un vairāk nesaņemsi \"push\" paziņojum
     <string name="media_picker_both_capture_title">Uzņemt foto vai video</string>
     <string name="media_picker_cannot_record_video">Neizdodas ierakstīt video</string>
 
-    <string name="permissions_rationale_popup_title">Riot informācija</string>
-    <string name="permissions_rationale_msg_storage">Riot-am nepieciešama atļauja piekļūt foto un video bibliotēkai, lai nosūtītu un saglabātu pielikumus.
+    <string name="permissions_rationale_popup_title">Element informācija</string>
+    <string name="permissions_rationale_msg_storage">Element-am nepieciešama atļauja piekļūt foto un video bibliotēkai, lai nosūtītu un saglabātu pielikumus.
 
 Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja nosūtīt failus no Tava tālruņa.</string>
-    <string name="permissions_rationale_msg_camera">Riot-am nepieciešama atļauja piekļūt kamerai, lai uzņemtu foto un nodrošinātu video zvanus.</string>
+    <string name="permissions_rationale_msg_camera">Element-am nepieciešama atļauja piekļūt kamerai, lai uzņemtu foto un nodrošinātu video zvanus.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Lūdzu dot piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot-am nepieciešama atļauja piekļūt mikrofonam, lai nodrošinātu audio zvanus.</string>
+    <string name="permissions_rationale_msg_record_audio">Element-am nepieciešama atļauja piekļūt mikrofonam, lai nodrošinātu audio zvanus.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot-am nepieciešama atļauja piekļūt kamerai un mikrofonam, lai veiktu videozvanus.
+    <string name="permissions_rationale_msg_camera_and_audio">Element-am nepieciešama atļauja piekļūt kamerai un mikrofonam, lai veiktu videozvanus.
 
 Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus.</string>
-    <string name="permissions_rationale_msg_contacts">Riot-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
+    <string name="permissions_rationale_msg_contacts">Element-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
 
-Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja atrast Tavus kontaktus, kuri ir sasniedzami Riotā.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
+Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja atrast Tavus kontaktus, kuri ir sasniedzami Elementā.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
 
-Vai dot Riotam piekļuvi kontaktiem?</string>
+Vai dot Elementam piekļuvi kontaktiem?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Atvaino… Darbība nav veikta dēļ nepietiekamām piekļuves atļaujām</string>
 
@@ -715,7 +715,7 @@ Lai turpinātu, ievadi savu paroli.</string>
 Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="encryption_information_verify_key_match">Apstiprinu, ka atslēgas sakrīt</string>
 
-    <string name="e2e_enabling_on_app_update">Riot tagad nodrošina end-to-end šifrēšanu, bet Tev ir jāizrakstās un jāierakstās par jaunu, lai to iespējotu.
+    <string name="e2e_enabling_on_app_update">Element tagad nodrošina end-to-end šifrēšanu, bet Tev ir jāizrakstās un jāierakstās par jaunu, lai to iespējotu.
 
 Tu to vari izdarīt tūlīt vai vēlāk - lietotnes Iestatījumos.</string>
 
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 26aa4c3ff8..ace1f04563 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -490,7 +490,7 @@
     <string name="room_settings_mention_only">Kun nevninger</string>
     <string name="settings_olm_version">olm-versjon</string>
     <string name="settings_deactivate_account_section">Deaktiver kontoen</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="settings_integration_manager">Integreringsbehandler</string>
 
@@ -698,7 +698,7 @@
     <string name="user_directory_header">Brukerkatalog</string>
     <string name="matrix_only_filter">Bare matrix-kontakter</string>
     <string name="no_conversation_placeholder">Ingen samtaler</string>
-    <string name="no_contact_access_placeholder">Du ga ikke Riot tilgang til dine lokale kontakter</string>
+    <string name="no_contact_access_placeholder">Du ga ikke Element tilgang til dine lokale kontakter</string>
     <string name="people_no_identity_server">Ingen identitetsserver konfigurert.</string>
 
     <string name="rooms_directory_header">Romkatalog</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 4ce368fca7..871b4cd7d7 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -84,7 +84,7 @@
     <string name="local_address_book_header">Lokale contactenlijst</string>
     <string name="matrix_only_filter">Alleen Matrix-contacten</string>
     <string name="no_conversation_placeholder">Geen gesprekken</string>
-    <string name="no_contact_access_placeholder">U heeft Riot geen toegang tot uw lokale contacten gegeven</string>
+    <string name="no_contact_access_placeholder">U heeft Element geen toegang tot uw lokale contacten gegeven</string>
     <string name="no_result_placeholder">Geen resultaten</string>
 
     <!-- Rooms fragment -->
@@ -247,23 +247,23 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informatie</string>
-    <string name="permissions_rationale_msg_storage">Riot heeft toegang nodig tot uw mediabestanden om bijlagen te verzenden en op te slaan.
+    <string name="permissions_rationale_msg_storage">Element heeft toegang nodig tot uw mediabestanden om bijlagen te verzenden en op te slaan.
 \n
 \nVerleen toegang op de volgende pop-up om bestanden vanaf uw telefoon te sturen.</string>
-    <string name="permissions_rationale_msg_camera">Riot heeft toegang nodig tot uw camera om foto’s en video-oproepen te maken.</string>
+    <string name="permissions_rationale_msg_camera">Element heeft toegang nodig tot uw camera om foto’s en video-oproepen te maken.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVerleen toegang op de volgende pop-up om de oproep te maken."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot heeft toegang nodig tot uw microfoon om spraakoproepen te maken.</string>
+    <string name="permissions_rationale_msg_record_audio">Element heeft toegang nodig tot uw microfoon om spraakoproepen te maken.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nVerleen toegang op de volgende pop-up om de oproep te maken."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
+    <string name="permissions_rationale_msg_camera_and_audio">Element heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
 \n
 \nVerleen toegang op de volgende pop-ups om de oproep te maken.</string>
-    <string name="permissions_rationale_msg_contacts">Riot kan uw adresboek benaderen om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers. 
+    <string name="permissions_rationale_msg_contacts">Element kan uw adresboek benaderen om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers.
 \nAls u het goed vindt om uw adresboek hiervoor te delen, verleen dan toegang op de volgende pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot kan uw adresboek gebruiken om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers. 
+    <string name="permissions_msg_contacts_warning_other_androids">Element kan uw adresboek gebruiken om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers.
 \n 
 \nWilt u uw adresboek hiervoor delen\?</string>
 
@@ -659,7 +659,7 @@
     <string name="encryption_information_verify_device_warning2">Als het overeenkomt, drukt u op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en zou u het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
     <string name="encryption_information_verify_key_match">Ik verifieer dat de sleutels overeenkomen</string>
 
-    <string name="e2e_enabling_on_app_update">Riot ondersteunt nu eind-tot-eind-versleuteling, maar u moet zich opnieuw aanmelden om het in te schakelen.
+    <string name="e2e_enabling_on_app_update">Element ondersteunt nu eind-tot-eind-versleuteling, maar u moet zich opnieuw aanmelden om het in te schakelen.
 \n
 \nU kunt dit nu of later doen vanuit de app-instellingen.</string>
 
@@ -917,13 +917,13 @@
     <string name="settings_deactivate_my_account">Mijn account deactiveren</string>
 
     <string name="startup_notification_privacy_title">Meldingsprivacy</string>
-    <string name="startup_notification_privacy_message">Riot kan op de achtergrond werken om uw meldingen veilig en privé te beheren. Dit beïnvloedt mogelijk het accuverbruik.</string>
+    <string name="startup_notification_privacy_message">Element kan op de achtergrond werken om uw meldingen veilig en privé te beheren. Dit beïnvloedt mogelijk het accuverbruik.</string>
     <string name="startup_notification_privacy_button_grant">Toestemming verlenen</string>
     <string name="startup_notification_privacy_button_other">Kies een andere optie</string>
 
     <string name="settings_opt_in_of_analytics">Statistische gegevens (analytics) versturen</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot verzamelt anonieme statistische gegevens (analytics) om het voor ons mogelijk te maken om de app te verbeteren.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Schakel statistische gegevens in om ons te helpen bij het verbeteren van Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element verzamelt anonieme statistische gegevens (analytics) om het voor ons mogelijk te maken om de app te verbeteren.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Schakel statistische gegevens in om ons te helpen bij het verbeteren van Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, ik wil helpen!</string>
 
     <string name="widget_integration_missing_parameter">Er ontbreekt een vereiste parameter.</string>
@@ -950,7 +950,7 @@
     <string name="e2e_re_request_encryption_key_sent">Sleutelaanvraag verstuurd.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Aanvraag verstuurd</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Start Riot op een ander apparaat dat het bericht kan ontsleutelen, zodat het de sleutels naar deze sessie kan sturen.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Start Element op een ander apparaat dat het bericht kan ontsleutelen, zodat het de sleutels naar deze sessie kan sturen.</string>
 
     <string name="lock_screen_hint">Typ hier…</string>
 
@@ -1055,7 +1055,7 @@
     <string name="auth_accept_policies">Gelieve het beleid van deze thuisserver te lezen en aanvaarden:</string>
 
     <string name="settings_call_category">Oproepen</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gebruik de standaardbeltoon van Riot voor inkomende oproepen</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Gebruik de standaardbeltoon van Element voor inkomende oproepen</string>
     <string name="settings_call_ringtone_title">Beltoon voor inkomende oproepen</string>
     <string name="settings_call_ringtone_dialog_title">Selecteer beltoon voor oproepen:</string>
 
@@ -1129,7 +1129,7 @@
     <string name="settings_troubleshoot_test_device_settings_title">Sessie-instellingen.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Meldingen zijn ingeschakeld voor deze sessie.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Meldingen zijn niet ingeschakeld voor deze sessie. 
-\nGelieve de Riot-instellingen te controleren.</string>
+\nGelieve de Element-instellingen te controleren.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Inschakelen</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Aangepaste instellingen.</string>
@@ -1140,7 +1140,7 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play-diensten controleren</string>
     <string name="settings_troubleshoot_test_play_services_success">De APK van Google Play Services is beschikbaar en up-to-date.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot maakt gebruikt van Google Play Services om pushberichten af te leveren, maar dit lijkt niet juist geconfigureerd te zijn:
+    <string name="settings_troubleshoot_test_play_services_failed">Element maakt gebruikt van Google Play Services om pushberichten af te leveren, maar dit lijkt niet juist geconfigureerd te zijn:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play-diensten herstellen</string>
 
@@ -1150,11 +1150,11 @@
     <string name="settings_troubleshoot_test_fcm_failed">Het FCM-bewijs is niet opgehaald:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nDeze fout is onafhankelijk van Riot. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde gebruiker niet mogen hinderen.</string>
+\nDeze fout is onafhankelijk van Element. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde gebruiker niet mogen hinderen.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nDeze fout is onafhankelijk van Riot. Ze kan verschillende oorzaken hebben. Misschien werkt het als u het later opnieuw probeert. U kunt ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van uw apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
+\nDeze fout is onafhankelijk van Element. Ze kan verschillende oorzaken hebben. Misschien werkt het als u het later opnieuw probeert. U kunt ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van uw apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nDeze fout is onafhankelijk van Riot. Er is geen Google-account verbonden met de telefoon. Open het accountbeheer en voeg er een Google-account toe.</string>
+\nDeze fout is onafhankelijk van Element. Er is geen Google-account verbonden met de telefoon. Open het accountbeheer en voeg er een Google-account toe.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Account toevoegen</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Bewijsregistratie</string>
@@ -1174,19 +1174,19 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Starten bij opstarten van apparaat</string>
     <string name="settings_troubleshoot_test_service_boot_success">De dienst zal starten wanneer het apparaat wordt herstart.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en u zult geen meldingen ontvangen tot u Riot hebt geopend.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en u zult geen meldingen ontvangen tot u Element hebt geopend.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Starten bij opstarten inschakelen</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Achtergrondbeperkingen controleren</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Achtergrondbeperkingen zijn uitgeschakeld voor Riot. Deze test dient uitgevoerd te worden met een mobiele verbinding (geen wifi).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Achtergrondbeperkingen zijn uitgeschakeld voor Element. Deze test dient uitgevoerd te worden met een mobiele verbinding (geen wifi).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Achtergrondbeperkingen zijn ingeschakeld voor Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Achtergrondbeperkingen zijn ingeschakeld voor Element.
 \nAl wat de app probeert te doen zal in de achtergrond hevig beperkt worden; dit kan het correct functioneren van meldingen beïnvloeden.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Beperkingen uitschakelen</string>
 
     <string name="settings_troubleshoot_test_battery_title">Accuoptimalisatie</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot wordt niet beperkt door accuoptimalisatie.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element wordt niet beperkt door accuoptimalisatie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Als een gebruiker een apparaat los van de oplader een tijd laat stilliggen, met het scherm uitgeschakeld, gaat het apparaat in slaapmodus. Dit verhindert apps de toegang tot het netwerk, en stelt hun taken, synchronisaties en standaardalarmen uit.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimalisatie negeren</string>
 
@@ -1202,8 +1202,8 @@
     <string name="settings_send_message_with_enter_summary">De Enter-knop van het toetsenbord zal berichten versturen in plaats van een regeleinde in te voegen</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Achtergrondverbinding</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot heeft een achtergrondverbinding met lage impact nodig om betrouwbare meldingen te kunnen hebben.
-\nOp het volgende scherm zult u gevraagd worden om Riot toestemming te verlenen om altijd in de achtergrond te kunnen draaien, gelieve deze toestemming te verlenen.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element heeft een achtergrondverbinding met lage impact nodig om betrouwbare meldingen te kunnen hebben.
+\nOp het volgende scherm zult u gevraagd worden om Element toestemming te verlenen om altijd in de achtergrond te kunnen draaien, gelieve deze toestemming te verlenen.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Toestemming verlenen</string>
 
     <string name="settings_data_save_mode_summary">Databesparingsmodus past een specifieke filter toe zodat aanwezigheidsupdates en typmeldingen weggefilterd worden.</string>
@@ -1276,18 +1276,18 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Er is geen geldige APK van Google Play Services gevonden. Meldingen zullen mogelijk niet correct functioneren.</string>
 
-    <string name="store_title">Riot.im - Communiceer op uw manier</string>
-    <string name="store_whats_new">We blijven Riot.im voortdurend aanpassen en verbeteren. Het volledige wijzigingslogboek vindt u hier: %1$s. Om niets te missen, houdt u best uw updates ingeschakeld.</string>
+    <string name="store_title">Element - Communiceer op uw manier</string>
+    <string name="store_whats_new">We blijven Element voortdurend aanpassen en verbeteren. Het volledige wijzigingslogboek vindt u hier: %1$s. Om niets te missen, houdt u best uw updates ingeschakeld.</string>
     <string name="store_short_description">Een universele en veilige chat-app, volledig onder uw controle.</string>
-    <string name="store_full_description">Een chat-app, onder uw controle en heel flexibel. Riot laat u communiceren zoals u dat wilt. Gemaakt voor [matrix] - de standaard voor open, gedecentraliseerde communicatie. 
+    <string name="store_full_description">Een chat-app, onder uw controle en heel flexibel. Element laat u communiceren zoals u dat wilt. Gemaakt voor [matrix] - de standaard voor open, gedecentraliseerde communicatie.
 \n 
 \nMaak een gratis account aan op matrix.org, verkrijg uw eigen server op https://modular.im, of gebruik een andere Matrix-server. 
 \n 
-\nWaarom zou ik voor Riot.im kiezen\? 
+\nWaarom zou ik voor Element kiezen\?
 \n 
 \n• VOLLEDIGE COMMUNICATIE: maak gesprekken aan rond uw teams, uw vrienden, uw gemeenschap - hoe u maar wilt! Chat, deel bestanden, voeg widgets toe en maak stem- en video-oproepen - allemaal volledig gratis. 
 \n 
-\n• KRACHTIGE INTEGRATIE: gebruik Riot.im met de hulpmiddelen waarmee u vertrouwd bent. Met Riot.im kunt u zelfs chatten met gebruikers en groepen op andere chat-apps. 
+\n• KRACHTIGE INTEGRATIE: gebruik Element met de hulpmiddelen waarmee u vertrouwd bent. Met Element kunt u zelfs chatten met gebruikers en groepen op andere chat-apps.
 \n 
 \n• PRIVÉ EN VEILIG: houd uw gesprekken geheim. Eind-tot-eind-versleuteling van de bovenste plank zorgt ervoor dat uw privécommunicatie ook privé blijft. 
 \n 
@@ -1300,7 +1300,7 @@
     <string name="passphrase_empty_error_message">Voer een wachtwoord in</string>
     <string name="passphrase_passphrase_too_weak">Wachtwoord is te zwak</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als u wilt dat Riot een herstelsleutel genereert.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als u wilt dat Element een herstelsleutel genereert.</string>
     <string name="keys_backup_no_session_error">Geen Matrix-sessie beschikbaar</string>
 
     <string name="keys_backup_setup_step1_title">Verlies nooit uw versleutelde berichten</string>
@@ -1432,7 +1432,7 @@
 
     <string name="autodiscover_invalid_response">Ongeldig thuisserverontdekkingsantwoord</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveropties automatisch aanvullen</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot heeft een aangepaste serverconfiguratie gedetecteerd voor uw gebruikers-ID-domein ‘%1$s’:
+    <string name="autodiscover_well_known_autofill_dialog_message">Element heeft een aangepaste serverconfiguratie gedetecteerd voor uw gebruikers-ID-domein ‘%1$s’:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Configuratie gebruiken</string>
 
@@ -1524,13 +1524,13 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Zal %s gebruiken om te assisteren in het geval dat uw thuisserver er niet over beschikt (uw IP-adres zal tijdens een oproep gedeeld worden)</string>
     <string name="invite_no_identity_server_error">Voeg een identiteitsserver toe in de instellingen om dit te doen.</string>
     <string name="settings_add_3pid_confirm_password_title">Bevestig uw wachtwoord</string>
-    <string name="settings_add_3pid_flow_not_supported">U kunt dit niet doen vanaf de mobiele Riot</string>
+    <string name="settings_add_3pid_flow_not_supported">U kunt dit niet doen vanaf de mobiele Element</string>
     <string name="settings_background_fdroid_sync_mode">Synchroniseren op de achtergrond (experimenteel)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Geoptimaliseerd voor batterij</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot zal op een batterijzuinige manier synchroniseren op de achtergrond.
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element zal op een batterijzuinige manier synchroniseren op de achtergrond.
 \nAfhankelijk van de staat van uw apparaat kan het besturingssysteem de synchronisatie uitstellen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Geoptimaliseerd voor snelheid</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot zal periodiek op de achtergrond synchroniseren (configureerbaar).
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element zal periodiek op de achtergrond synchroniseren (configureerbaar).
 \nDit heeft een negatieve impact op uw batterij- en datagebruik. Er zal een melding getoond worden ter informatie.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Geen achtergrondssynchronisatie</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">U zal geen melding van berichten ontvangen als de app zich in de achtergrond bevindt.</string>
@@ -1596,7 +1596,7 @@
     <string name="identity_server_not_defined">U gebruikt geen identiteitsserver</string>
     <string name="identity_server_not_defined_for_password_reset">Er is geen identiteitsserver geconfigureerd. Dit is vereist om uw wachtwoord opnieuw in te stellen.</string>
 
-    <string name="security_warning_identity_server">Vorige versies van Riot hadden een veiligheidsfout die er voor kon zorgen dat je Identiteits Server (%1$s) toegang tot je account had. Indien je %2$s vertrouwt, dan kun je dit negeren; anders log je uit en weer in.
+    <string name="security_warning_identity_server">Vorige versies van Element hadden een veiligheidsfout die er voor kon zorgen dat je Identiteits Server (%1$s) toegang tot je account had. Indien je %2$s vertrouwt, dan kun je dit negeren; anders log je uit en weer in.
 \n
 \nLees meer details hier:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1641,7 +1641,7 @@
     <string name="group_all_communities">Alle Gemeenschappen</string>
 
     <string name="room_preview_no_preview">Dit gesprek kan niet worden voorvertoond</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">De voorvertoning van wereld-leesbare gesprekken zijn nog niet ondersteund in RiotX</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">De voorvertoning van wereld-leesbare gesprekken zijn nog niet ondersteund in Element</string>
 
     <string name="fab_menu_create_room">Gesprekken</string>
     <string name="fab_menu_create_chat">Directe Berichten</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index c9de2e9c13..d0ce86f127 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -99,7 +99,7 @@
     <string name="user_directory_header">Brukarkatalog</string>
     <string name="matrix_only_filter">Berre Matrix-kontaktar</string>
     <string name="no_conversation_placeholder">Ingen samtalar</string>
-    <string name="no_contact_access_placeholder">Du gav ikkje Riot tilgang til dei lokale kontaktane dine</string>
+    <string name="no_contact_access_placeholder">Du gav ikkje Element tilgang til dei lokale kontaktane dine</string>
     <string name="no_result_placeholder">Ingen treff</string>
 
     <string name="rooms_header">Rom</string>
@@ -232,7 +232,7 @@
     <string name="e2e_re_request_encryption_key_sent">Nøkkelførespurnaden er sendt.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Førespurnaden er send</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Start Riot på ein annan eining som kan dekryptere meldingen, slik at den kan sende nøkklane til denne sesjonen</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Start Element på ein annan eining som kan dekryptere meldingen, slik at den kan sende nøkklane til denne sesjonen</string>
 
     <string name="read_receipts_list">Les kvitteringsliste</string>
 
@@ -278,23 +278,23 @@
     <string name="media_picker_cannot_record_video">Kan ikkje spela inn video</string>
 
     <string name="permissions_rationale_popup_title">Info</string>
-    <string name="permissions_rationale_msg_storage">Riot treng tilgang til bilete- og videobiblioteket for å senda og lagra vedlegg. 
+    <string name="permissions_rationale_msg_storage">Element treng tilgang til bilete- og videobiblioteket for å senda og lagra vedlegg.
 \n 
 \nGje tilgang i sprettvindauget som kjem for å senda filer frå mobilen.</string>
-    <string name="permissions_rationale_msg_camera">Riot treng tilgang til kameraet ditt for å ta bilete og videosamtalar.</string>
+    <string name="permissions_rationale_msg_camera">Element treng tilgang til kameraet ditt for å ta bilete og videosamtalar.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVer venleg og gje tilgang på sprettvindauget som kjem for å starta samtalen."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot treng tilgang til mikrofonen din for å utføra talesamtalar.</string>
+    <string name="permissions_rationale_msg_record_audio">Element treng tilgang til mikrofonen din for å utføra talesamtalar.</string>
     <string name="call_error_ice_failed">Mediaforbindelsen feila</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nGjer vel og gje tilgang på sprettvindauget som kjem for å utføra samtalen."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot treng tilgang til kameraet og mikrofonen din for å utføra videosamtalar.
+    <string name="permissions_rationale_msg_camera_and_audio">Element treng tilgang til kameraet og mikrofonen din for å utføra videosamtalar.
 \n
 \nGjer vel og gjev tilgang på sprettvindauget som kjem for å utføra samtalen.</string>
-    <string name="permissions_rationale_msg_contacts">Riot treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer. Viss du samtykker til å dele kontaktlista, ver venleg å tillat tilgang på sprettvindauget som kjem på neste skjermbilete.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer. 
+    <string name="permissions_rationale_msg_contacts">Element treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer. Viss du samtykker til å dele kontaktlista, ver venleg å tillat tilgang på sprettvindauget som kjem på neste skjermbilete.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer.
 \n
 \nSamtykker du til å dele adresseboka for dette føremålet \?</string>
 
@@ -553,14 +553,14 @@
     <string name="settings_deactivate_my_account">Deaktiver kontoen min</string>
 
     <string name="startup_notification_privacy_title">Varselpersonvern</string>
-    <string name="startup_notification_privacy_message">Riot kan køyra i bakgrunnen for å sikkert og privat halda styr på varsla dine (dette kan påverka batteribruk).</string>
+    <string name="startup_notification_privacy_message">Element kan køyra i bakgrunnen for å sikkert og privat halda styr på varsla dine (dette kan påverka batteribruk).</string>
     <string name="startup_notification_privacy_button_grant">Gje tillating</string>
     <string name="startup_notification_privacy_button_other">vel noko anna</string>
 
     <string name="settings_analytics">Statistikk</string>
     <string name="settings_opt_in_of_analytics">Send statistikkdata</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot samlar anonym statistikk inn for å forbetra applikasjonen.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Ver venleg og skru statistikkinnsamling på for å hjelpa oss med å forbetra Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element samlar anonym statistikk inn for å forbetra applikasjonen.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Ver venleg og skru statistikkinnsamling på for å hjelpa oss med å forbetra Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, eg vil hjelpa til!</string>
 
     <string name="settings_data_save_mode">Datasparingsmodus</string>
@@ -745,7 +745,7 @@ For å gå fram, ver venleg og skriv passordet ditt inn.</string>
     <string name="encryption_information_verify_device_warning2">Viss det samsvarer, klikk Verifiser-knappen under. Viss det ikkje gjer det, avlyttar nokon andre denne sesjonen og du bør sannsynlegvis svarteliste den. I framtida vil denne verifikasjonsprosessen bli meir forbetra.</string>
     <string name="encryption_information_verify_key_match">Eg stadfestar at nøkklane er like</string>
 
-    <string name="e2e_enabling_on_app_update">Riot støttar no ende-til-ende-kryptering men du må logga inn att for å skru det på. Du kan gjera det no eller seinare i App-innstillingane.</string>
+    <string name="e2e_enabling_on_app_update">Element støttar no ende-til-ende-kryptering men du må logga inn att for å skru det på. Du kan gjera det no eller seinare i App-innstillingane.</string>
 
     <string name="unknown_devices_alert_title">Rommet inneheld ukjende sesjonar</string>
     <string name="unknown_devices_alert_message">Rommet inneheld ukjende sesjonar som ikkje har blitt verifiserte. Det er med andre ord ingen garanti for at sesjonane høyrer til brukarane dei hevdar. Vi tilråder deg å gå gjennom verifikasjonsprosessen for kvar eining før du går vidare, men du kan sende meldingen på nytt utan å godkjenne viss du vil. 
@@ -962,7 +962,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
 
     <string name="login_error_unknown_host">Det gjeng ikkje å nå URL-en, gjer vel og sjå til honom</string>
     <string name="settings_call_category">Oppringingar</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Bruk standard Riot-ringetone for innkommande samtalar</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Bruk standard Element-ringetone for innkommande samtalar</string>
     <string name="settings_call_ringtone_title">Ringetone for innkommande samtalar</string>
     <string name="settings_call_ringtone_dialog_title">Vel ringetone for samtalar:</string>
 
@@ -998,7 +998,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="settings_troubleshoot_test_device_settings_title">Sesjonsinnstillingar.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Varslingar er aktivert for denne sesjonen.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Varslingar er deaktivert for denne sesjonen.
-\nSjekk Riot-innstillingane.</string>
+\nSjekk Element-innstillingane.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Skru på</string>
 
     <string name="notification_sync_init">setter opp tenesta</string>
@@ -1046,7 +1046,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="invite_no_identity_server_error">Legg til ein identitetstenar i innstillingane for å utføre denne handlinga.</string>
     <string name="room_sliding_menu_version_x">Versjon %s</string>
     <string name="settings_add_3pid_confirm_password_title">Stadfest ditt passord</string>
-    <string name="settings_add_3pid_flow_not_supported">Denne handlinga kan ikkje utførast frå Riot på mobil</string>
+    <string name="settings_add_3pid_flow_not_supported">Denne handlinga kan ikkje utførast frå Element på mobil</string>
     <string name="settings_add_3pid_authentication_needed">Authentisering er påkrevd</string>
 
 
@@ -1070,15 +1070,15 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="settings_show_join_leave_messages">Vis bli-med/forlat hendelsar</string>
     <string name="settings_show_join_leave_messages_summary">Invitasjonar, utkastingar og utestengingar gjeld ikkje dette.</string>
     <string name="room_widget_open_in_browser">Opna i nettlesar</string>
-    <string name="store_full_description">Program for nettprat, under din kontroll og med full fleksibilitet. Riot let deg kommunisera på den måten du vil. Implementert for [matrix] - protokollen for open, desentralisert kommunikasjon. 
+    <string name="store_full_description">Program for nettprat, under din kontroll og med full fleksibilitet. Element let deg kommunisera på den måten du vil. Implementert for [matrix] - protokollen for open, desentralisert kommunikasjon.
 \n 
 \nOpprett ein gratis matrix.org-konto, sett opp eigen tenar på https://modular.im, eller ta i bruk ein annan Matrix-tenar. 
 \n 
-\nKvifor velje Riot.im\? 
+\nKvifor velje Element\?
 \n 
 \n• KOMPLETT KOMMUNIKASJON: Bygg rom rund teamet, venner, fellesskapet - du bestemmer! Send direktemeldingar, del filer, legg til tillegg, start talesamtalar og videokonferansar! Alt saman er tilgjengeleg utan kostnad.
 \n 
-\n• KRAFTIGE INTEGRASJONAR: Bruk Riot.im saman med verktøya du nyttar frå før. Med Riot.Im kan du kommunisera med brukarar på andre plattformar. 
+\n• KRAFTIGE INTEGRASJONAR: Bruk Element saman med verktøya du nyttar frå før. Med Element kan du kommunisera med brukarar på andre plattformar.
 \n 
 \n• PRIVAT OG SIKKER: Hald dine samtalar hemmelege. Industristandard ende-til-ende-kryptering sørgjer for at private samtalar forblir private. 
 \n 
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index fbc23d09b8..a77fda2994 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -209,11 +209,11 @@
     <string name="media_picker_cannot_record_video">Nie można nagrać filmu</string>
 
     <string name="permissions_rationale_popup_title">Informacja</string>
-    <string name="permissions_rationale_msg_storage">Riot wymaga uprawnienia, aby wysyłać i zapisywać pliki multimedialne.
+    <string name="permissions_rationale_msg_storage">Element wymaga uprawnienia, aby wysyłać i zapisywać pliki multimedialne.
 
 Przyznaj dostęp w następnym oknie.</string>
-    <string name="permissions_rationale_msg_camera">Riot wymaga uprawnienia, aby wykonywać zdjęcia i nawiązywać połączenia wideo.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot wymaga uprawnienia, aby przeprowadzić połączenie audio.</string>
+    <string name="permissions_rationale_msg_camera">Element wymaga uprawnienia, aby wykonywać zdjęcia i nawiązywać połączenia wideo.</string>
+    <string name="permissions_rationale_msg_record_audio">Element wymaga uprawnienia, aby przeprowadzić połączenie audio.</string>
     <string name="permissions_action_not_performed_missing_permissions">Nie można wykonać operacji, ze względu na brak wymaganych uprawnień</string>
 
     <string name="media_slider_saved">Zapisano</string>
@@ -598,13 +598,13 @@ Zezwól na dostęp w następnym oknie aby móc wykonać połączenie.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Zezwól na dostęp w następnym oknie aby móc wykonać połączenie.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot wymaga dostępu do kamery i mikrofonu, aby przeprowadzać rozmowy wideo.
+    <string name="permissions_rationale_msg_camera_and_audio">Element wymaga dostępu do kamery i mikrofonu, aby przeprowadzać rozmowy wideo.
 
 Przyznaj dostęp w następnym oknie.</string>
-    <string name="permissions_rationale_msg_contacts">Riot może sprawdzić Twoją książkę adresową, aby znajdywać innych użytkowników Matrixa bazując na ich adresie e-mail i numerze telefonu. Jeśli zgadzasz się na udostępnienie Twojej książki adresowej w tym celu, zezwól na dostęp w następnym okienku.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot wymaga dostępu do kontaktów, aby znajdywać innych użytkowników Matrixa bazując na adresie e-mail i numerze telefonu. 
+    <string name="permissions_rationale_msg_contacts">Element może sprawdzić Twoją książkę adresową, aby znajdywać innych użytkowników Matrixa bazując na ich adresie e-mail i numerze telefonu. Jeśli zgadzasz się na udostępnienie Twojej książki adresowej w tym celu, zezwól na dostęp w następnym okienku.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element wymaga dostępu do kontaktów, aby znajdywać innych użytkowników Matrixa bazując na adresie e-mail i numerze telefonu.
 \n
-\nZezwolić Riot na dostęp do kontaktów\?</string>
+\nZezwolić Element na dostęp do kontaktów\?</string>
 
     <string name="list_members">Lista uczestników</string>
     <string name="open_chat_header">Otwarty nagłówek</string>
@@ -737,7 +737,7 @@ Jesteś pewien?</string>
     <string name="e2e_re_request_encryption_key_sent">Prośba o klucz wysłana.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Prośba wysłana</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Uruchom proszę Riot na innym urządzeniu, które może odszyfrować wiadomość, aby wysłać klucze do tej sesji.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Uruchom proszę Element na innym urządzeniu, które może odszyfrować wiadomość, aby wysłać klucze do tej sesji.</string>
 
     <string name="settings_notification_privacy">Prywatność powiadomień</string>
     <string name="settings_notification_privacy_normal">Standardowa</string>
@@ -754,13 +754,13 @@ Jesteś pewien?</string>
     <string name="settings_deactivate_my_account">Dezaktywuj moje konto</string>
 
     <string name="startup_notification_privacy_title">Prywatność powiadomień</string>
-    <string name="startup_notification_privacy_message">Riot może działać w tle aby bezpiecznie i prywatnie zarządzać Twoimi powiadomieniami. To może mieć wpływ na zużycie baterii.</string>
+    <string name="startup_notification_privacy_message">Element może działać w tle aby bezpiecznie i prywatnie zarządzać Twoimi powiadomieniami. To może mieć wpływ na zużycie baterii.</string>
     <string name="startup_notification_privacy_button_grant">Nadaj uprawnienie</string>
     <string name="startup_notification_privacy_button_other">Wybierz inną opcję</string>
 
     <string name="settings_opt_in_of_analytics">Wysyłaj dane analityczne</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot zbiera anonimowe informacje które pozwolą ulepszyć aplikację.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Włącz proszę dane analityczne, aby pomóc nam ulepszyć Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element zbiera anonimowe informacje które pozwolą ulepszyć aplikację.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Włącz proszę dane analityczne, aby pomóc nam ulepszyć Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Tak, chcę pomóc!</string>
 
     <string name="settings_delete_notification_targets_confirmation">Czy na pewno chcesz usunąć ten cel powiadomień?</string>
@@ -788,7 +788,7 @@ Uwaga: ten plik może zostać usunięty, jeśli aplikacja zostanie odinstalowana
     <string name="encryption_information_unverify">Usuń weryfikację</string>
     <string name="encryption_information_verify_device_warning">Aby sprawdzić czy ta sesja jest zaufana, skontaktuj się z jej właścicielem używając innych form (np. osobiście lub telefonicznie) i zapytaj czy klucz, który widzą w ustawieniach użytkownika dla tego urządzenia pasuje do klucza poniżej:</string>
     <string name="encryption_information_verify_device_warning2">Jeśli klucz pasuje, potwierdź to przyciskiem poniżej. Jeśli nie, to ktoś inny najprawdopodobniej przejmuje lub podszywa się pod tą sesję i powinieneś dodać tę sesję do czarnej listy. W przyszłości proces weryfikacji będzie bardziej skomplikowany.</string>
-    <string name="e2e_enabling_on_app_update">Riot obsługuje już szyfrowanie end-to-end (E2E), ale musisz zalogować się ponownie, aby je włączyć.
+    <string name="e2e_enabling_on_app_update">Element obsługuje już szyfrowanie end-to-end (E2E), ale musisz zalogować się ponownie, aby je włączyć.
 
 Możesz to zrobić teraz lub później z poziomu ustawień aplikacji.</string>
 
@@ -1029,7 +1029,7 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
 
-    <string name="settings_call_ringtone_use_riot_ringtone">Użyj domyślnego dzwonka Riot dla przychodzących połączeń</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Użyj domyślnego dzwonka Element dla przychodzących połączeń</string>
     <string name="call_anyway">Zadzwoń mimo to</string>
     <string name="settings_call_category">Połączenia</string>
     <string name="room_participants_action_kick">Wyrzuć</string>
@@ -1076,8 +1076,8 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
 Sprawdź ustawienia systemowe.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Powiadomienia są wyłączone dla twojego konta.
 Sprawdź ustawienia konta.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Powiadomienia nie są włączone dla tej sesji. Proszę sprawdź ustawienia Riot.</string>
-    <string name="store_whats_new">"Zawsze wprowadzamy zmiany i ulepszenia do Riot.im.
+    <string name="settings_troubleshoot_test_device_settings_failed">Powiadomienia nie są włączone dla tej sesji. Proszę sprawdź ustawienia Element.</string>
+    <string name="store_whats_new">"Zawsze wprowadzamy zmiany i ulepszenia do Element.
 Pełną listę zmian można znaleźć tutaj: %1$s.
 Aby upewnić się, że niczego nie przegapisz, po prostu miej włączone aktualizacje."</string>
     <string name="account_additional_info">Dodatkowe informacje: %s</string>
@@ -1391,14 +1391,14 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Niektóre rodzaje wiadomości będą ciche (wygenerują powiadomienie bez dźwięku).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Nie udało się wczytać niestandardowych reguł, spróbuj ponowić.</string>
     <string name="settings_troubleshoot_test_play_services_title">Weryfikacja Usług Google</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot używa Usług Google Play do dostarczania wiadomości push. Konfiguracja usług nie wydaje się być prawidłowa:
+    <string name="settings_troubleshoot_test_play_services_failed">Element używa Usług Google Play do dostarczania wiadomości push. Konfiguracja usług nie wydaje się być prawidłowa:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_success">Otrzymano token FCM:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Niepowodzenie przy pobieraniu tokena FCM:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nRiot nie ma wpływu na wystąpienie tego problemu. Na tym urządzeniu nie ma konta Google. Otwórz menadżer kont i dodaj konto Google.</string>
+\nElement nie ma wpływu na wystąpienie tego problemu. Na tym urządzeniu nie ma konta Google. Otwórz menadżer kont i dodaj konto Google.</string>
     <string name="settings_troubleshoot_test_token_registration_success">Token FCM z powodzeniem zarejestrowany na serwerze domowym.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Niepowodzenie przy rejestracji tokena FCM na serwerze domowym:
 \n%1$s</string>
@@ -1407,7 +1407,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Usługa nie uruchomiła się ponownie</string>
 
     <string name="settings_troubleshoot_test_service_boot_success">Usługa zostanie uruchomiona przy starcie urządzenia.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Usługa nie zostanie uruchomiona przy starcie urządzenia, nie otrzymasz żadnych powiadomień, dopóki Riot nie zostanie uruchomiony.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Usługa nie zostanie uruchomiona przy starcie urządzenia, nie otrzymasz żadnych powiadomień, dopóki Element nie zostanie uruchomiony.</string>
     <string name="sas_security_advise">Dla zwiększenia bezpieczeństwa, zalecamy aby wykonać ten krok osobiście lub przez inne zaufane środki komunikacji.</string>
     <string name="content_reported_content">Treść została zgłoszona.
 \n
@@ -1430,24 +1430,24 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_call_ringtone_use_default_stun">Pozwól na awaryjny serwer wspomagania połączeń</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Użyje %s aby wspomagać gdy Twój serwer domowy takiego nie ofertuje (Twój adres IP będzie udostępniony podczas połączenia)</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nBłąd jest poza kontrolą Riot i nawiązując do Google sygnalizuje on, iż urządzenie posiada zbyt wiele aplikacji zarejestrowanych z FCM. Błąd występuje jedynie w przypadku posiadania skrajnie wielu aplikacji, w związku z czym nie powinno dotknąć to normalnego użytkownika.</string>
+\nBłąd jest poza kontrolą Element i nawiązując do Google sygnalizuje on, iż urządzenie posiada zbyt wiele aplikacji zarejestrowanych z FCM. Błąd występuje jedynie w przypadku posiadania skrajnie wielu aplikacji, w związku z czym nie powinno dotknąć to normalnego użytkownika.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nBłąd jest poza kontrolą Riot. Może on występować z wielu powodów. Przypuszczalnie aplikacja powróci do normalnego stanu po spróbowaniu ponownie, chociaż można sprawdzić także w ustawieniach systemu uprawnienia Usług Google Play dotyczące dostępu do sieci, sprawdzić prawidłowość zegaru urządzenia lub też, może być to błąd niestandardowego oprogramowania systemowego.</string>
+\nBłąd jest poza kontrolą Element. Może on występować z wielu powodów. Przypuszczalnie aplikacja powróci do normalnego stanu po spróbowaniu ponownie, chociaż można sprawdzić także w ustawieniach systemu uprawnienia Usług Google Play dotyczące dostępu do sieci, sprawdzić prawidłowość zegaru urządzenia lub też, może być to błąd niestandardowego oprogramowania systemowego.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktywuj uruchamianie przy starcie systemu</string>
 
-    <string name="settings_troubleshoot_test_bg_restricted_success">Restrykcje dotyczące działania aplikacji w tle są wyłączone dla Riot. Test powinen zostać uruchomiony używając danych komórkowych (bez WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Restrykcje dotyczące działania aplikacji w tle są wyłączone dla Element. Test powinen zostać uruchomiony używając danych komórkowych (bez WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">"Restrykcje dotyczące działania aplikacji w tle są włączone dla Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">"Restrykcje dotyczące działania aplikacji w tle są włączone dla Element.
 \nPraca którą aplikacja próbuje wykonać  będzie agresywnie ograniczona podczas działania w tle i może wpłynąć na wyświetlanie powiadomień.
 \n%1$s"</string>
-    <string name="settings_troubleshoot_test_battery_success">Na Riot nie ma wpływu Optymalizacja Baterii.</string>
+    <string name="settings_troubleshoot_test_battery_success">Na Element nie ma wpływu Optymalizacja Baterii.</string>
     <string name="settings_troubleshoot_test_battery_failed">Jeżeli użytkownik pozostawi urządzenie odłączone od zasilania oraz nieużywane przez określony okres, z wyłączonym ekranem, urządzenie przejdzie w tryb Doze. Uniemożliwia to aplikacjom dostęp do sieci i opóźnia ich zadania, synchonizację oraz standardowe alarmy.</string>
     <string name="settings_background_fdroid_sync_mode">Tryb synchronizacji w tle (eksperymentalny)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Zoptymalizowano dla baterii</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot będzie synchronizował się w tle w sposób który oszczędza limitowane zasoby urządzenia (baterię).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element będzie synchronizował się w tle w sposób który oszczędza limitowane zasoby urządzenia (baterię).
 \nW zależności od stanu zasobów urządzenia, synchronizacja może być opóźniania przez system operacyjny.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Zopytmalizowano dla działania w czasie rzeczywistym</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot będzie synchornizował się okresowo o ściśle określonym czasie (konfigurowalne).
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element będzie synchornizował się okresowo o ściśle określonym czasie (konfigurowalne).
 \nWpłynie to na użycie baterii i sieci, na panelu powiadomień pozostanie wyświetlone stałe powiadomiene o nasłuchiwaniu zdarzeń.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Brak synchronizacji w tle</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nie będziesz otrzymywać powiadomień o przychodzących wiadomościach gdy aplikacja będzie działać w tle.</string>
@@ -1467,8 +1467,8 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="settings_discovery_category">Znajdź</string>
     <string name="settings_discovery_manage">Zarządzaj ustawieniami wyszukiwania.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot potrzebuje utrzymać mało wpływowe połączenie w tle, w celu otrzymywania wiarygodnych powiadomień.
-\nNa następnym ekranie zostanie się poproszonym o pozwolenie działania w tle dla Riot, proszę zaakceptować.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element potrzebuje utrzymać mało wpływowe połączenie w tle, w celu otrzymywania wiarygodnych powiadomień.
+\nNa następnym ekranie zostanie się poproszonym o pozwolenie działania w tle dla Element, proszę zaakceptować.</string>
     <string name="settings_data_save_mode_summary">Tryb oszczędzania danych użyje filtra szczegółowego, w związku z czym aktualizacje o obecności i powiadomienia o pisaniu zostaną przefiltrowane.</string>
 
     <string name="settings_media">Media</string>
@@ -1516,17 +1516,17 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="no_valid_google_play_services_apk">Nie znaleziono prawidłowej aplikacji Usługi Google Play. Powiadomienia mogą nie działać prawidłowo.</string>
 
-    <string name="store_title">Riot.im - Rozmawiaj, we własny sposób</string>
+    <string name="store_title">Element - Rozmawiaj, we własny sposób</string>
     <string name="store_short_description">Bezpieczna aplikacja czatu całkowicie pod Twoją kontrolą.</string>
-    <string name="store_full_description">Aplikacja czatu, całkowicie pod twoją kontrolą i całkowicie dopasowująca się. Riot pozwala na komunikowanie się w jakikolwiek sposób chcesz. Stworzony dla [Matrix] - standardu otwartej, zdecentralizowanej komunikacji.
+    <string name="store_full_description">Aplikacja czatu, całkowicie pod twoją kontrolą i całkowicie dopasowująca się. Element pozwala na komunikowanie się w jakikolwiek sposób chcesz. Stworzony dla [Matrix] - standardu otwartej, zdecentralizowanej komunikacji.
 \n
 \nStwórz darmowe konto matrix.org, zdobądź swój własny serwer na https://modular.im, lub użyj innego serwera Matrix.
 \n
-\nDlaczego warto wybrać Riot.im\?
+\nDlaczego warto wybrać Element\?
 \n
 \n• KOMPLETNA KOMUNIKACJA: Stwórz pokoje dla twojego zespołu, przyjaciół, społeczności - tak, jak lubisz! Czatuj, udostępniaj pliki, dodawaj widżety i wykonuj połączenia głosowe lub wideo - wszystko za darmo.
 \n
-\n• SILNA INTEGRACJA: Używaj Riot.im z narzędziami które znasz i kochasz. Z Riot.im możesz pisać z użytkownikami i grupami na innych aplikacjach do czatu.
+\n• SILNA INTEGRACJA: Używaj Element z narzędziami które znasz i kochasz. Z Element możesz pisać z użytkownikami i grupami na innych aplikacjach do czatu.
 \n
 \n• PRYWATNE I BEZPIECZNE: Utrzymuj twoje konwersacje w sekrecie. Nowoczesne szyfrowanie typu \"end-to-end\" zapewnia, że to co jest prywatne, pozostaje prywatne
 \n
@@ -1536,7 +1536,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="passphrase_passphrase_too_weak">Hasło jest zbyt słabe</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Proszę usunąć hasło, jeżeli chcesz aby Riot wygenerował klucz odzyskiwania.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Proszę usunąć hasło, jeżeli chcesz aby Element wygenerował klucz odzyskiwania.</string>
     <string name="keys_backup_no_session_error">Brak dostępnych sesji Matrix</string>
 
     <string name="keys_backup_setup_step1_title">Nie utrać zaszyfrowanych wiadomości</string>
@@ -1617,7 +1617,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="autodiscover_invalid_response">Nieprawidłowa odpowiedź funkcji autoodkrywania serwera domowego</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opcje automatycznego uzupełniania serwerów</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot wykryło niestandardową konfigurację serwera dla Twojej domeny userID \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element wykryło niestandardową konfigurację serwera dla Twojej domeny userID \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Użyj Konfiguracji</string>
 
@@ -1632,7 +1632,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="sas_view_request_action">Wyświetl żądanie</string>
     <string name="sas_verified_successful_description">Bezpieczne wiadomości od tego użytkownika są zabezpeiczone za pomocą szyfrowania end-to-end i są nie do odczytania przez osoby trzecie.</string>
     <string name="call_failed_no_ice_title">Połączenie nie powiodło się z powodu niewłaściwie skonfigurowanego serwera</string>
-    <string name="settings_add_3pid_flow_not_supported">Nie możesz tego zrobić z mobilnej aplikacji Riot</string>
+    <string name="settings_add_3pid_flow_not_supported">Nie możesz tego zrobić z mobilnej aplikacji Element</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Niektóre powiadomienia są wyłączone w osobistej konfiguracji.</string>
     <string name="settings_troubleshoot_test_play_services_success">Usługi Google Play są aktualne.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Automatycznie uruchom ponownie usługę powiadomień</string>
@@ -1655,7 +1655,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="sas_error_m_mismatched_sas">SAS nie zgadza się</string>
     <string name="sas_error_m_unexpected_message">Sesja otrzymała niespodziewaną wiadomość</string>
     <string name="sas_error_m_invalid_message">Otrzymano nieprawidłową wiadomość</string>
-    <string name="security_warning_identity_server">Poprzednie wersje Riot posiadały błąd bezpieczeństwa, który umożliwiał Twojemu serwerowi tożsamości (%1$s) dostęp do Twojego konta. Jeżeli ufasz %2$s, możesz to zignorować; w przeciwnym wypadku wyloguj się i zaloguj ponownie.
+    <string name="security_warning_identity_server">Poprzednie wersje Element posiadały błąd bezpieczeństwa, który umożliwiał Twojemu serwerowi tożsamości (%1$s) dostęp do Twojego konta. Jeżeli ufasz %2$s, możesz to zignorować; w przeciwnym wypadku wyloguj się i zaloguj ponownie.
 \n
 \nInformacje o szczegółach tutaj:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1666,12 +1666,12 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_list_rooms_empty_body">Twoje pokoje będą wyświetlane tutaj</string>
 
     <string name="malformed_message">Nieprawidłowe zdarzenie, nie można wyświetlić</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Podgląd globalnego, publicznego pokoju nie jest wciąż wspierany w RiotX</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Podgląd globalnego, publicznego pokoju nie jest wciąż wspierany w Element</string>
 
     <string name="keys_backup_unable_to_get_trust_info">Wystąpił błąd podczas otrzymywania zaufanych informacji</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Wystąpił błąd podczas uzyskiwania danych kluczy kopii zapasowej</string>
 
-    <string name="alpha_disclaimer_content_line_1">Jako że RiotX jest we wczesnej fazie rozwoju, niektóre funkcje mogą być niedostępne i możesz doświadczyć błędów.</string>
+    <string name="alpha_disclaimer_content_line_1">Jako że Element jest we wczesnej fazie rozwoju, niektóre funkcje mogą być niedostępne i możesz doświadczyć błędów.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">Najnowsza lista funkcji jest zawsze na %1$s, i jeżeli znajdziesz błąd, proszę wyślij raport w lewym górnym menu poprzez \"Ekran domowy\", postaramy załatać się go tak szybko, jak tylko się da.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Opis w Sklepie Play</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Jeżeli znajdziesz błędy, proszę wyślij raport za pomocą menu w lewym górnym rogu \"Ekranu domowego\", postaramy się je naprawić tak szybko, jak tylko się da.</string>
@@ -1695,15 +1695,15 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Wyświetl ukryte wydarzenia na linii czasowej</string>
 
-    <string name="store_riotx_title">RiotX - Klient Matrix następnej generacji</string>
+    <string name="store_riotx_title">Element - Klient Matrix następnej generacji</string>
     <string name="store_riotx_short_description">Szybszy i lżejszy klient Matrix używający najnowszych frameworków Androida</string>
-    <string name="store_riotx_full_description">RiotX jest nowym klientem dla protokołu Matrix (Matrix.org): otwarta sieć dla bezpiecznej, zdecentralizowej komunikacji. RiotX jest całkowicie przepisanym klientem Riot, opartym na nowym SDK Matrix dla systemu Android.
+    <string name="store_riotx_full_description">Element jest nowym klientem dla protokołu Matrix (Matrix.org): otwarta sieć dla bezpiecznej, zdecentralizowej komunikacji. Element jest całkowicie przepisanym klientem Riot, opartym na nowym SDK Matrix dla systemu Android.
 \n
-\nUwaga: Jest to wersja beta. RiotX jest obecnie w fazie aktywnego rozwoju i posiada ograniczenia oraz (mamy nadzieje że niewiele) błędy. Wszystkie opinie są mile widziane!
+\nUwaga: Jest to wersja beta. Element jest obecnie w fazie aktywnego rozwoju i posiada ograniczenia oraz (mamy nadzieje że niewiele) błędy. Wszystkie opinie są mile widziane!
 \n
-\nRiotX wspiera: • Logowanie do istniejącego konta • Tworzenie pokoi oraz dołączanie do pokoi publicznych • Akceptowanie i odrzucanie zaproszeń • Wyświetlanie listy pokoi użytkowników • Wyświetlanie informacji o pokoju • Wysyłanie wiadomości tekstowych • Wysyłanie załączników • Odczytywanie i pisanie wiadomości w zaszyfrowanych pokojach • Kryptografia: Kopię zapasową kluczy E2E, zaawansowaną weryfikację urządzeń, żądanie udostępniania kluczy i odpowiedzi na nie • Powiadomienia push • Jasne, Ciemne oraz Czarne motywy
+\nElement wspiera: • Logowanie do istniejącego konta • Tworzenie pokoi oraz dołączanie do pokoi publicznych • Akceptowanie i odrzucanie zaproszeń • Wyświetlanie listy pokoi użytkowników • Wyświetlanie informacji o pokoju • Wysyłanie wiadomości tekstowych • Wysyłanie załączników • Odczytywanie i pisanie wiadomości w zaszyfrowanych pokojach • Kryptografia: Kopię zapasową kluczy E2E, zaawansowaną weryfikację urządzeń, żądanie udostępniania kluczy i odpowiedzi na nie • Powiadomienia push • Jasne, Ciemne oraz Czarne motywy
 \n
-\nNie wszystkie funkcje Riot są wdrożone w RiotX. Główne niedostępne (pojawią się już wkrótce!) funkcje: • Ustawienia pokoi (wyświetl listę członków pokoi) • Rozmowy • Widżety • …</string>
+\nNie wszystkie funkcje Element są wdrożone w Element. Główne niedostępne (pojawią się już wkrótce!) funkcje: • Ustawienia pokoi (wyświetl listę członków pokoi) • Rozmowy • Widżety • …</string>
 
     <string name="edited_suffix">(edytowano)</string>
 
@@ -1782,7 +1782,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \n
 \nJeżeli nie chcesz widzieć treści od tego użytkownika, możesz go zablokować aby ukryć jego wiadomości</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot potrzebuje uprawnień aby zapisywać klucze E2E na dysku.
+    <string name="permissions_rationale_msg_keys_backup_export">Element potrzebuje uprawnień aby zapisywać klucze E2E na dysku.
 \n
 \nPozwól na dostęp w następnym oknie aby móc eksportować klucze ręcznie.</string>
 
@@ -1815,18 +1815,18 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="login_continue">Kontynuuj</string>
     <string name="login_connect_to">Połącz z %1$s</string>
-    <string name="login_connect_to_modular">Połącz z Modular</string>
+    <string name="login_connect_to_modular">Połącz z Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Połącz z serwerem niestandardowym</string>
     <string name="login_signin_to">Zaloguj się do %1$s</string>
     <string name="login_signup">Zarejestruj</string>
     <string name="login_signin">Zaloguj się</string>
     <string name="login_signin_sso">Kontynuuj za pomocą logowania jednostopniowego</string>
 
-    <string name="login_server_url_form_modular_hint">Adres Modular</string>
+    <string name="login_server_url_form_modular_hint">Adres Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Adres</string>
     <string name="login_server_url_form_modular_text">Hosting premium dla organizacji</string>
-    <string name="login_server_url_form_modular_notice">Wprowadź adres Riot Modular lub serwera którego chcesz użyć</string>
-    <string name="login_server_url_form_other_notice">Wprowadź adres serwera lub Riot z którym chcesz się połączyć</string>
+    <string name="login_server_url_form_modular_notice">Wprowadź adres Element Modular lub serwera którego chcesz użyć</string>
+    <string name="login_server_url_form_other_notice">Wprowadź adres serwera lub Element z którym chcesz się połączyć</string>
 
     <string name="login_sso_error_message">Wystąpił błąd podczas ładowania strony: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikacja nie jest w stanie zalogować się do tego serwera domowego. Serwer domowy obsluguje następujące metody logowania: %1$s.
@@ -1900,7 +1900,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \nZatrzymać proces rejestracji\?</string>
 
     <string name="login_a11y_choose_matrix_org">Wybierz matrix.org</string>
-    <string name="login_a11y_choose_modular">Wybierz modular</string>
+    <string name="login_a11y_choose_modular">Wybierz Element Matrix Services</string>
     <string name="login_a11y_choose_other">Wybierz niestandardowy serwer domowy</string>
     <string name="login_a11y_captcha_container">Wypełnij zadanie Captcha</string>
     <string name="login_terms_title">Zaakceptuj warunki aby kontynuować</string>
@@ -1945,7 +1945,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \nZaloguj się ponownie aby uzyskać dostęp do danych konta i wiadomości.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Utracisz dostęp do zaszyfrowanych wiadomości do czasu, aż zalogujesz się aby odzyskać Twoje klucze szyfrujące.</string>
     <string name="soft_logout_clear_data_dialog_submit">Wyczyść dane</string>
-    <string name="soft_logout_sso_not_same_user_error">Aktualna sesja jest dla użytkownika %1$s, podajesz natomiast dane dla użytkownika %2$s. Nie jest to wspierane przez RiotX.
+    <string name="soft_logout_sso_not_same_user_error">Aktualna sesja jest dla użytkownika %1$s, podajesz natomiast dane dla użytkownika %2$s. Nie jest to wspierane przez Element.
 \nNa początku usuń dane, następnie zaloguj ponownie na innym koncie.</string>
 
     <string name="permalink_malformed">Link matrix.to został zdeformowany</string>
@@ -1964,7 +1964,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="autocomplete_limited_results">Wyświetlanie jedynie początkowych wyników, wprowadź więcej znaków…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Bezproblemowy</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX może zawieszać się częściej gdy napotka na niespodziewany błąd</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element może zawieszać się częściej gdy napotka na niespodziewany błąd</string>
 
     <string name="command_description_verify">Żądanie weryfikujące podany userID</string>
     <string name="command_description_shrug">Preparuje ¯\\_(ツ)_/¯ dla zwykłej wiadomości tekstowej</string>
@@ -2049,9 +2049,9 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="room_member_jump_to_read_receipt">Przeskocz do znacznika odczytania</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX nie obsługuje wydarzeń typu \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX nie obsługuje wiadomości typu \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX napotkał problem przy wyświetlaniu zawartości wydarzenia z ID \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element nie obsługuje wydarzeń typu \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element nie obsługuje wiadomości typu \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element napotkał problem przy wyświetlaniu zawartości wydarzenia z ID \'%1$s\'</string>
 
     <string name="unignore">Nie ignoruj</string>
 
@@ -2234,7 +2234,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="e2e_use_keybackup">Odblokuj historię zaszyfrowanych wiadomości</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="refresh">Odśwież</string>
 
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index aee5ad7747..8063d79633 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -84,7 +84,7 @@
     <string name="local_address_book_header">Agenda de endereços local</string>
     <string name="matrix_only_filter">Apenas contatos Matrix</string>
     <string name="no_conversation_placeholder">Não há conversas</string>
-    <string name="no_contact_access_placeholder">Você não autorizou o Riot a acessar seus contatos locais</string>
+    <string name="no_contact_access_placeholder">Você não autorizou o Element a acessar seus contatos locais</string>
     <string name="no_result_placeholder">Nenhum resultado</string>
 
     <!-- Rooms fragment -->
@@ -241,26 +241,26 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
-    <string name="permissions_rationale_msg_storage">Riot necessita permissão para acessar sua galeria de fotos e vídeos para poder enviar e salvar anexos.
+    <string name="permissions_rationale_msg_storage">Element necessita permissão para acessar sua galeria de fotos e vídeos para poder enviar e salvar anexos.
 
 Por favor, permita acesso na próxima tela para poder enviar arquivos do seu celular.</string>
-    <string name="permissions_rationale_msg_camera">Riot necessita permissão para acessar sua câmera para poder tirar fotos e fazer chamadas de vídeo.</string>
+    <string name="permissions_rationale_msg_camera">Element necessita permissão para acessar sua câmera para poder tirar fotos e fazer chamadas de vídeo.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Por favor, autorize o acesso na próxima tela para poder fazer a chamada.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot necessita permissão para acessar seu microfone para realizar chamadas de áudio.</string>
+    <string name="permissions_rationale_msg_record_audio">Element necessita permissão para acessar seu microfone para realizar chamadas de áudio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Por favor, autorize acesso na próxima tela para poder fazer a chamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot necessita permissão para acessar sua câmera e seu microfone para realizar chamadas de vídeo.
+    <string name="permissions_rationale_msg_camera_and_audio">Element necessita permissão para acessar sua câmera e seu microfone para realizar chamadas de vídeo.
 
 Por favor, autorize acesso na próxima tela para poder fazer a chamada.</string>
-    <string name="permissions_rationale_msg_contacts">Riot necessita permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus emails e números de telefone.
+    <string name="permissions_rationale_msg_contacts">Element necessita permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus emails e números de telefone.
 
-Por favor, autorize o acesso na próxima tela para poder encontrar usuários na sua agenda que podem ser contactados pelo Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot necessita sua permissão para acessar os seus contatos para poder encontrar usuários na sua agenda a partir de seus emails e números de telefone.
+Por favor, autorize o acesso na próxima tela para poder encontrar usuários na sua agenda que podem ser contactados pelo Element.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element necessita sua permissão para acessar os seus contatos para poder encontrar usuários na sua agenda a partir de seus emails e números de telefone.
 
-Você autoriza o Riot a acessar seus contatos?</string>
+Você autoriza o Element a acessar seus contatos?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Desculpe. A ação não foi realizada, por falta de permissão</string>
 
@@ -651,7 +651,7 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="encryption_information_verify_device_warning2">Se é igual, clique no botão verificar abaixo. Se não é igual, então alguém está interceptando este dispositivo e você pode querer clicar no botão bloquear. No futuro, este processo de verificação será mais sofisticado.</string>
     <string name="encryption_information_verify_key_match">Eu confirmo que as chaves são iguais</string>
 
-    <string name="e2e_enabling_on_app_update">Riot agora permite criptografia ponta-a-ponta mas você precisa fazer login de novo para ativá-la.\n\nVocê pode fazer isso mais tarde a partir das configurações do aplicativo.</string>
+    <string name="e2e_enabling_on_app_update">Element agora permite criptografia ponta-a-ponta mas você precisa fazer login de novo para ativá-la.\n\nVocê pode fazer isso mais tarde a partir das configurações do aplicativo.</string>
 
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Esta sala contém dispositivos desconhecidos</string>
@@ -908,7 +908,7 @@ Quer adicionar alguns agora?</string>
     <string name="e2e_re_request_encryption_key_sent">Pedido de chave enviado.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Pedido enviado</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, use o Riot em outro dispositivo que possa descriptografar a mensagem de modo que possa enviar as chaves a este dispositivo.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, use o Element em outro dispositivo que possa descriptografar a mensagem de modo que possa enviar as chaves a este dispositivo.</string>
 
     <plurals name="format_time_s">
         <item quantity="one">%ds</item>
@@ -953,13 +953,13 @@ Quer adicionar alguns agora?</string>
     <string name="settings_deactivate_my_account">Desativar a minha conta</string>
 
     <string name="startup_notification_privacy_title">Privacidade das notificações</string>
-    <string name="startup_notification_privacy_message">Riot pode funcionar em segundo plano para gerenciar as suas notificações de forma segura e confidencial. Isso poderá impactar o uso da bateria.</string>
+    <string name="startup_notification_privacy_message">Element pode funcionar em segundo plano para gerenciar as suas notificações de forma segura e confidencial. Isso poderá impactar o uso da bateria.</string>
     <string name="startup_notification_privacy_button_grant">Conceder a permissão</string>
     <string name="startup_notification_privacy_button_other">Escolha outra opção</string>
 
     <string name="settings_opt_in_of_analytics">Enviar dados de uso</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot coleta dados de uso anônimos para nos ajudar a melhorar o aplicativo.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Por favor, habilite o envio de dados de uso para nos ajudar a melhorar o Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element coleta dados de uso anônimos para nos ajudar a melhorar o aplicativo.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Por favor, habilite o envio de dados de uso para nos ajudar a melhorar o Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Sim, eu quero ajudar!</string>
 
     <string name="settings_without_flair">Você não faz parte de nenhuma comunidade atualmente.</string>
@@ -1037,7 +1037,7 @@ A visibilidade de mensagens no Matrix é parecida com a dos e-mails. Se esquecer
     <string name="auth_accept_policies">Por favor revise e aceite as políticas desse servidor doméstico:</string>
 
     <string name="settings_call_category">Chamadas</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Use o toque padrão da Riot para chamadas recebidas</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Use o toque padrão da Element para chamadas recebidas</string>
     <string name="settings_call_ringtone_title">Toque de chamada recebida</string>
     <string name="settings_call_ringtone_dialog_title">Selecione o toque para chamadas:</string>
 
@@ -1068,12 +1068,12 @@ Por favor revise as configurações da conta.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notificações estão habilitadas para este dispositivo.</string>
     <string name="room_participants_action_kick">Desconectar</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Notificações não são permitidas para este dispositivo.
-Por favor revise as configurações do Riot.</string>
+Por favor revise as configurações do Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Habilitar</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Revisão do Play Services</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK está disponível e atualizado.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot usa Google Play Services para entregar mensagens push, mas isto não parece está configurado corretamente:
+    <string name="settings_troubleshoot_test_play_services_failed">Element usa Google Play Services para entregar mensagens push, mas isto não parece está configurado corretamente:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Consertar Play Services</string>
 
@@ -1100,12 +1100,12 @@ Tente reiniciar a aplicação.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Começar na inicialização</string>
     <string name="settings_troubleshoot_test_service_boot_success">Serviço irá iniciar quando o dispositivo for reiniciado.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">O serviço não irá começar quando o dispositivo for reiniciado, você não irá receber notificações até o Riot for aberto uma vez.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">O serviço não irá começar quando o dispositivo for reiniciado, você não irá receber notificações até o Element for aberto uma vez.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Habilitar Começar na inicialização</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Revisar restrições de segundo plano</string>
     <string name="settings_troubleshoot_test_battery_title">Otimização de bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot não é afetado pela Otimização de Bateria.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element não é afetado pela Otimização de Bateria.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Reinicialização Automática do Serviço de Notificações</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desabilitar restrições</string>
 
@@ -1121,11 +1121,11 @@ Tente reiniciar a aplicação.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Mostrar eventos da conta</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Inclui avatar e alterações no nome de exibição.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Conexão em segundo plano</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot precisa manter um baixo impacto na conexão em segundo plano para ter notificações confiáveis.
-Na próxima tela, você será solicitado a permitir que o Riot funcione sempre em segundo plano, por favor aceite.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Restrições de segundo plano estão desabilitadas para o Riot. este teste deve executar usando os dados móveis (sem WIFI).
+    <string name="startup_notification_fdroid_battery_optim_message">Element precisa manter um baixo impacto na conexão em segundo plano para ter notificações confiáveis.
+Na próxima tela, você será solicitado a permitir que o Element funcione sempre em segundo plano, por favor aceite.</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Restrições de segundo plano estão desabilitadas para o Element. este teste deve executar usando os dados móveis (sem WIFI).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Restrições em segundo plano estão habilitadas para o Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Restrições em segundo plano estão habilitadas para o Element.
 Trabalhos que o aplicativo tentar fazer serão restringidos agressivamente enquanto isto estiver em segundo plano, isto poderá afetar as notificações.
 %1$s</string>
     <string name="settings_send_markdown">Formatação Markdown</string>
@@ -1166,21 +1166,21 @@ Trabalhos que o aplicativo tentar fazer serão restringidos agressivamente enqua
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Nenhum APK do Google Play Services válido foi encontrado. Notificações podem não funcionar corretamente.</string>
 
-    <string name="store_title">Riot.im - Comunique-se do seu jeito</string>
+    <string name="store_title">Element - Comunique-se do seu jeito</string>
     <string name="store_short_description">Um aplicativo de bate-papo universal seguro totalmente sob seu controle.</string>
     <string name="settings_troubleshoot_test_battery_failed">Se um usuário deixar um dispositivo desconectado e parado por um período de tempo, com a tela desligada, o dispositivo entrará no modo Cochilo. Isso impede que os aplicativos acessem a rede e adiem seus trabalhos, sincronizações e alarmes padrão.</string>
     <string name="passphrase_create_passphrase">Criar passphrase</string>
     <string name="passphrase_passphrase_does_not_match">Passphrases devem corresponder</string>
     <string name="settings_lazy_loading_title">Carregamento Lazy dos membros das salas</string>
-    <string name="store_full_description">"Um aplicativo de bate-papo, sob seu controle e totalmente flexível. Riot permite que você se comunique do jeito que você quer. Desenvolvido para o [matrix] - o padrão para comunicação aberta e descentralizada.
+    <string name="store_full_description">"Um aplicativo de bate-papo, sob seu controle e totalmente flexível. Element permite que você se comunique do jeito que você quer. Desenvolvido para o [matrix] - o padrão para comunicação aberta e descentralizada.
 
 Obtenha uma conta matrix.org grátis, obtenha seu próprio servidor em https://modular.im ou use outro servidor Matrix.
 
-Por que escolher o Riot.im?
+Por que escolher o Element?
 
 • COMUNICAÇÃO COMPLETA: Construa salas em torno de suas equipes, seus amigos, sua comunidade - como quiser! Converse, compartilhe arquivos, adicione widgets e faça chamadas de voz e vídeo - tudo de graça.
 
-• INTEGRAÇÕES PODEROSAS: Use o Riot.im com as ferramentas que você conhece e ama. Com Riot.im você pode conversar com usuários e grupos em outros aplicativos de bate-papo.
+• INTEGRAÇÕES PODEROSAS: Use o Element com as ferramentas que você conhece e ama. Com Element você pode conversar com usuários e grupos em outros aplicativos de bate-papo.
 
 • PRIVADO E SEGURO: Mantenha suas conversas em segredo. A criptografia de ponta a ponta do estado da arte garante que a comunicação privada permaneça privada.
 
@@ -1190,7 +1190,7 @@ Por que escolher o Riot.im?
 
     <string name="video_call_in_progress">Chamada de Vídeo em andamento…</string>
 
-    <string name="store_whats_new">"Estamos sempre fazendo alterações e melhorias no Riot.im.
+    <string name="store_whats_new">"Estamos sempre fazendo alterações e melhorias no Element.
 O changelog completo pode ser encontrado aqui: %1$s.
 Para garantir que você não perca nada, mantenha suas atualizações ativadas."</string>
     <string name="title_activity_keys_backup_setup">Backup da chave</string>
@@ -1226,16 +1226,16 @@ Para garantir que você não perca nada, mantenha suas atualizações ativadas."
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Verifique as configurações</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nEste erro está fora do controle do Riot e, de acordo com o Google, esse erro indica que o dispositivo tem muitos aplicativos registrados com FCM. O erro só ocorre nos casos em que há números extremos de aplicativos, portanto, isso não deve afetar o usuário comum.</string>
+\nEste erro está fora do controle do Element e, de acordo com o Google, esse erro indica que o dispositivo tem muitos aplicativos registrados com FCM. O erro só ocorre nos casos em que há números extremos de aplicativos, portanto, isso não deve afetar o usuário comum.</string>
     <string name="ignore">Ignorar</string>
 
     <string name="auth_login_sso">Entre com o logon único</string>
     <string name="login_error_unknown_host">Este URL não está acessível, por favor verifique</string>
     <string name="login_error_ssl_handshake">Seu dispositivo está usando um protocolo de segurança TLS desatualizado, vulnerável a ataques. Para sua segurança, você não poderá se conectar</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nEste erro está fora de controle da Riot. Isso pode ocorrer por vários motivos. Talvez funcione se você tentar novamente mais tarde. Você também pode verificar se o Google Play Service não está restrito ao uso de dados nas configurações do sistema ou se o relógio do dispositivo está correto ou pode acontecer na ROM personalizada.</string>
+\nEste erro está fora de controle da Element. Isso pode ocorrer por vários motivos. Talvez funcione se você tentar novamente mais tarde. Você também pode verificar se o Google Play Service não está restrito ao uso de dados nas configurações do sistema ou se o relógio do dispositivo está correto ou pode acontecer na ROM personalizada.</string>
     <string name="notification_sync_init">Inicializando o serviço</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nEste erro está fora de controle do Riot. Não há conta do Google no telefone. Por favor, abra o gerenciador de contas e adicione uma conta do Google.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nEste erro está fora de controle do Element. Não há conta do Google no telefone. Por favor, abra o gerenciador de contas e adicione uma conta do Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Adicionar Conta</string>
 
     <string name="settings_noisy_notifications_preferences">Configurar notificações ruidosas</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index 86ff1053d3..8508330d5b 100755
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -83,7 +83,7 @@
     <string name="local_address_book_header">Lista de endereços local</string>
     <string name="matrix_only_filter">Apenas contactos do Matrix</string>
     <string name="no_conversation_placeholder">Não há conversas</string>
-    <string name="no_contact_access_placeholder">Não permitiu ao Riot aceder aos seus contactos locais</string>
+    <string name="no_contact_access_placeholder">Não permitiu ao Element aceder aos seus contactos locais</string>
     <string name="no_result_placeholder">Sem resultados</string>
 
     <!-- Rooms fragment -->
@@ -246,26 +246,26 @@ Pedimos desculpa pela inconveniência.</string>
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
-    <string name="permissions_rationale_msg_storage">O Riot necessita de permissão para aceder ao seu armazenamento de fotos e vídeos para poder enviar e guardar anexos.
+    <string name="permissions_rationale_msg_storage">O Element necessita de permissão para aceder ao seu armazenamento de fotos e vídeos para poder enviar e guardar anexos.
 
 Permita o acesso na próxima janela para poder enviar ficheiros a partir do seu telefone.</string>
-    <string name="permissions_rationale_msg_camera">O Riot necessita de permissão para aceder à sua câmara para poder tirar fotos e fazer chamadas de vídeo.</string>
+    <string name="permissions_rationale_msg_camera">O Element necessita de permissão para aceder à sua câmara para poder tirar fotos e fazer chamadas de vídeo.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Por favor, permita o acesso na próxima janela para poder realizar a chamada.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot necessita de permissão para aceder ao seu microfone para realizar chamadas de áudio.</string>
+    <string name="permissions_rationale_msg_record_audio">Element necessita de permissão para aceder ao seu microfone para realizar chamadas de áudio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Por favor, permita acesso na próxima janela para poder efetuar a chamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot necessita de permissão para aceder à sua câmara e ao seu microfone para realizar chamadas de vídeo.
+    <string name="permissions_rationale_msg_camera_and_audio">Element necessita de permissão para aceder à sua câmara e ao seu microfone para realizar chamadas de vídeo.
 
 Por favor, permita o acesso na próxima janela para poder efetuar a chamada.</string>
-    <string name="permissions_rationale_msg_contacts">O Riot necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus e-mails e números de telefone.
+    <string name="permissions_rationale_msg_contacts">O Element necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus e-mails e números de telefone.
 
-Por favor, permita o acesso na próxima janela para poder encontrar utilizadores na sua lista de contactos que podem ser contactados pelo Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">O Riot necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus endereços de email e números de telefone.
+Por favor, permita o acesso na próxima janela para poder encontrar utilizadores na sua lista de contactos que podem ser contactados pelo Element.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">O Element necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus endereços de email e números de telefone.
 
-Permitir ao Riot aceder aos seus contactos?</string>
+Permitir ao Element aceder aos seus contactos?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Desculpe… A ação não foi realizada, por falta de permissões</string>
 
@@ -659,7 +659,7 @@ Atenção: este ficheiro poderá ser apagado se a aplicação for desinstalada.<
     <string name="encryption_information_verify_device_warning2">Se é igual, clique no botão verificar, abaixo. Se não é igual, então alguém está a interceptar este dispositivo e você poderá querer colocá-lo na lista negra. No futuro, este processo de verificação irá ser mais sofisticado.</string>
     <string name="encryption_information_verify_key_match">Eu confirmo que as chaves são iguais</string>
 
-    <string name="e2e_enabling_on_app_update">O Riot agora permite criptografia ponta-a-ponta mas necessita de iniciar sessão novamente para ativá-la.
+    <string name="e2e_enabling_on_app_update">O Element agora permite criptografia ponta-a-ponta mas necessita de iniciar sessão novamente para ativá-la.
 
 Pode fazê-lo agora ou mais tarde a partir das definições da aplicação.</string>
 
@@ -794,7 +794,7 @@ Adicionar alguns agora?</string>
     <string name="e2e_re_request_encryption_key_sent">Pedido de chaves enviado.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Pedido enviado</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Por favor abra o Riot num dispositivo que consiga decifrar a mensagem, para que esse dispositivo possa enviar as chaves para este dispositivo.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Por favor abra o Element num dispositivo que consiga decifrar a mensagem, para que esse dispositivo possa enviar as chaves para este dispositivo.</string>
 
     <string name="groups_list">Lista de Grupos</string>
 
@@ -887,14 +887,14 @@ Adicionar alguns agora?</string>
     <string name="settings_deactivate_my_account">Desactivar a minha conta</string>
 
     <string name="startup_notification_privacy_title">Privacidade das Notificações</string>
-    <string name="startup_notification_privacy_message">O Riot pode executar em segundo plano para gerir as notificações de forma segura e confidencial (isso poderá afectar a utilização da bateria).</string>
+    <string name="startup_notification_privacy_message">O Element pode executar em segundo plano para gerir as notificações de forma segura e confidencial (isso poderá afectar a utilização da bateria).</string>
     <string name="startup_notification_privacy_button_grant">Conceder permissão</string>
     <string name="startup_notification_privacy_button_other">Escolha outra opção</string>
 
     <string name="settings_analytics">Estatísticas de uso</string>
     <string name="settings_opt_in_of_analytics">Enviar dados de análise de estatísticas</string>
-    <string name="settings_opt_in_of_analytics_summary">O Riot recolhe dados anónimos de análise de estatísticas para ajudar a melhorar a aplicação.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Por favor, permita o envio de dados de análise para ajudar-nos a melhorar o Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">O Element recolhe dados anónimos de análise de estatísticas para ajudar a melhorar a aplicação.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Por favor, permita o envio de dados de análise para ajudar-nos a melhorar o Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Sim, quero ajudar!</string>
 
     <string name="settings_flair">Insígnias</string>
@@ -1162,7 +1162,7 @@ Por favor, verifique configurações de aplicação</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desactivar restricções</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimização de bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot não é afectado por Optimização de bateria</string>
+    <string name="settings_troubleshoot_test_battery_success">Element não é afectado por Optimização de bateria</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorar Optimização</string>
 
     <string name="settings_noisy_notifications_preferences">Configurar Notificações de ruido</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index d11c536bf1..82f2accfda 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -84,7 +84,7 @@
     <string name="local_address_book_header">Локальные контакты</string>
     <string name="matrix_only_filter">Только Matrix контакты</string>
     <string name="no_conversation_placeholder">Нет диалогов</string>
-    <string name="no_contact_access_placeholder">Вы не дали доступ Riot к внутренним контактам</string>
+    <string name="no_contact_access_placeholder">Вы не дали доступ Element к внутренним контактам</string>
     <string name="no_result_placeholder">Нет результатов</string>
 
     <!-- Rooms fragment -->
@@ -244,17 +244,17 @@
     <string name="media_picker_cannot_record_video">Не удалось записать видео"</string>
 
     <!-- permissions Android M -->
-    <string name="permissions_rationale_popup_title">Riot Информация</string>
-    <string name="permissions_rationale_msg_storage">Riot необходимы разрешения на доступ к вашим фото и видео для сохранения и отправки сложений.\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность отправлять файлы.</string>
-    <string name="permissions_rationale_msg_camera">Riot необходимы разрешения на доступ к вашей камере, чтобы делать фото и совершать видеозвонки.</string>
+    <string name="permissions_rationale_popup_title">Element Информация</string>
+    <string name="permissions_rationale_msg_storage">Element необходимы разрешения на доступ к вашим фото и видео для сохранения и отправки сложений.\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность отправлять файлы.</string>
+    <string name="permissions_rationale_msg_camera">Element необходимы разрешения на доступ к вашей камере, чтобы делать фото и совершать видеозвонки.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
+    <string name="permissions_rationale_msg_record_audio">Element необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot необходимы разрешения на доступ к камере и микрофону для видеовызовов.
+    <string name="permissions_rationale_msg_camera_and_audio">Element необходимы разрешения на доступ к камере и микрофону для видеовызовов.
 
 Пожалуйста дайте разрешение в следующем окне для звонка.</string>
-    <string name="permissions_rationale_msg_contacts">Riot может проверить вашу адресную книгу, чтобы найти других пользователей Matrix по их электронной почте и номерам телефонов. Если вы согласны поделиться своей адресной книгой для этой цели, пожалуйста, откройте доступ на следующем всплывающем окне.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру. 
+    <string name="permissions_rationale_msg_contacts">Element может проверить вашу адресную книгу, чтобы найти других пользователей Matrix по их электронной почте и номерам телефонов. Если вы согласны поделиться своей адресной книгой для этой цели, пожалуйста, откройте доступ на следующем всплывающем окне.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру.
 \n
 \nСогласны ли вы поделиться своей адресной книгой для этой цели\?</string>
 
@@ -649,7 +649,7 @@
     <string name="encryption_information_verify_device_warning2">"Если совпадает, то нажмите кнопку подтвердить ниже. Если не совпадает, возможно кто-то пытается перехватить сессию и  вы захотите добавить его в черный список. В будущем данный процесс будет улучшен."</string>
     <string name="encryption_information_verify_key_match">Я проверил, что ключи совпадают</string>
 
-    <string name="e2e_enabling_on_app_update">Riot теперь поддерживает сквозное шифрование, но вам нужно снова войти в систему, чтобы включить его.
+    <string name="e2e_enabling_on_app_update">Element теперь поддерживает сквозное шифрование, но вам нужно снова войти в систему, чтобы включить его.
 
 Вы можете сделать это сейчас или позже из настроек приложения.</string>
 
@@ -914,7 +914,7 @@
     <string name="settings_notification_privacy_message_content_not_shown">• Уведомления <b>не будут показывать содержимое сообщения</b></string>
 
     <string name="startup_notification_privacy_title">Конфиденциальность уведомлений</string>
-    <string name="startup_notification_privacy_message">Riot может работать в фоновом режиме для управления конфиденциальностью и безопасностью ваших уведомлений. Это может повлиять на время работы от батареи.</string>
+    <string name="startup_notification_privacy_message">Element может работать в фоновом режиме для управления конфиденциальностью и безопасностью ваших уведомлений. Это может повлиять на время работы от батареи.</string>
     <string name="startup_notification_privacy_button_grant">Предоставить разрешение</string>
     <string name="startup_notification_privacy_button_other">Выбрать другой вариант</string>
 
@@ -931,8 +931,8 @@
     <string name="settings_deactivate_my_account">Деактивировать мой аккаунт</string>
 
     <string name="settings_opt_in_of_analytics">Отправка аналитических данных</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot собирает анонимную аналитику для улучшения приложения.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Пожалуйста, включите аналитику, чтобы помочь нам улучшить Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element собирает анонимную аналитику для улучшения приложения.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Пожалуйста, включите аналитику, чтобы помочь нам улучшить Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Да, я хочу помочь!</string>
 
     <string name="widget_integration_missing_parameter">Обязательный параметр отсутствует.</string>
@@ -960,7 +960,7 @@
     <string name="e2e_re_request_encryption_key_sent">Отправлен запрос ключа.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Запрос отправлен</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Запустите Riot на другом устройстве, которое может расшифровать сообщение, для отправки ключа на эту сессию.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Запустите Element на другом устройстве, которое может расшифровать сообщение, для отправки ключа на эту сессию.</string>
 
     <string name="lock_screen_hint">Введите здесь…</string>
 
@@ -1086,7 +1086,7 @@
     <string name="auth_accept_policies">Пожалуйста ознакомьтесь и подтвердите согласие с политикой этого сервера:</string>
 
     <string name="settings_call_category">Вызовы</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Использовать стандартную мелодию Riot для входящих звонков</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Использовать стандартную мелодию Element для входящих звонков</string>
     <string name="settings_call_ringtone_title">Мелодия звонка</string>
     <string name="settings_call_ringtone_dialog_title">Выберите мелодию звонка:</string>
 
@@ -1116,7 +1116,7 @@
     <string name="show_info_area_messages_and_errors">Для сообщений и ошибок</string>
     <string name="show_info_area_only_errors">Только для ошибок</string>
 
-    <string name="store_whats_new">"Мы постоянно изменяем и улучшаем Riot.im.
+    <string name="store_whats_new">"Мы постоянно изменяем и улучшаем Element.
 Полный список изменений можно найти здесь: %1$s.
 Чтобы ничего не пропустить просто держите обновления включенными."</string>
     <string name="accept">Принимаю</string>
@@ -1143,12 +1143,12 @@
     <string name="settings_troubleshoot_test_device_settings_title">Настройки сессии.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомления включены для этой сессии.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Уведомления не включено для этой сессии. 
-\nПожалуйста, проверьте настройки Riot.</string>
+\nПожалуйста, проверьте настройки Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Включить</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Проверка сервисов Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Google Play сервисов доступен и обновлён.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot использует сервисы Google Play для доставки push-сообщений, но не похоже что он настроен правильно:
+    <string name="settings_troubleshoot_test_play_services_failed">Element использует сервисы Google Play для доставки push-сообщений, но не похоже что он настроен правильно:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Исправить сервисы Play</string>
 
@@ -1175,13 +1175,13 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Запуск при загрузке</string>
     <string name="settings_troubleshoot_test_service_boot_success">Служба будет запущена после перезапуска устройства.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">При перезагрузке устройства служба не будет запущена , вы не будете получать уведомления, пока Riot не будет открыт один раз.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">При перезагрузке устройства служба не будет запущена , вы не будете получать уведомления, пока Element не будет открыт один раз.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Включить запуск при загрузке</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Проверьте фоновые ограничения</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Фоновые ограничения отключены для Riot. Этот тест должен быть запущен с использованием мобильных данных (без WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Фоновые ограничения отключены для Element. Этот тест должен быть запущен с использованием мобильных данных (без WIFI).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Фоновые ограничения включены для Riot.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Фоновые ограничения включены для Element.
 Работа приложения будет жестко ограничена, пока оно находится в фоновом режиме, и это может повлиять на уведомления.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Отключить ограничения</string>
@@ -1211,18 +1211,18 @@
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Не найден APK сервисов Google Play. Уведомления могут работать неправильно.</string>
 
-    <string name="store_title">Riot.im — общайся по-своему</string>
+    <string name="store_title">Element — общайся по-своему</string>
     <string name="store_short_description">Универсальное приложение для безопасного общения, полностью находящееся под вашим контролем.</string>
     <string name="settings_show_join_leave_messages_summary">Не влияет на приглашения, исключения и запреты.</string>
-    <string name="store_full_description">Приложение для чата, под вашим контролем и полностью гибкое. Riot позволяет вам общаться так, как вы хотите. Сделано для [matrix] — стандарта для открытого децентрализованного общения.
+    <string name="store_full_description">Приложение для чата, под вашим контролем и полностью гибкое. Element позволяет вам общаться так, как вы хотите. Сделано для [matrix] — стандарта для открытого децентрализованного общения.
 \n
 \nВы можете создать бесплатную учетную запись на matrix.org, завести собственный сервер по адресу https://modular.im или использовать другой сервер Matrix.
 \n
-\nПочему стоит выбрать Riot.im\?
+\nПочему стоит выбрать Element\?
 \n
 \n• ПОЛНОЦЕННАЯ СВЯЗЬ: создавайте комнаты для команд, друзей, сообществ — как хотите! Общайтесь, обменивайтесь файлами, добавляйте виджеты и совершайте голосовые и видеозвонки — и всё это бесплатно.
 \n
-\n• МОЩНЫЕ ИНТЕГРАЦИИ: Используйте Riot.im с инструментами, которые знаете и любите. С Riot.im вы можете даже общаться с пользователями и группами других приложений.
+\n• МОЩНЫЕ ИНТЕГРАЦИИ: Используйте Element с инструментами, которые знаете и любите. С Element вы можете даже общаться с пользователями и группами других приложений.
 \n
 \n• ЧАСТНЫЕ И БЕЗОПАСНЫЕ: держите ваши разговоры в тайне. Современное сквозное шифрование гарантирует, что частное общение остается частным.
 \n
@@ -1262,7 +1262,7 @@
     <string name="passphrase_empty_error_message">Пожалуйста, введите парольную фразу</string>
     <string name="passphrase_passphrase_too_weak">Парольная фраза слишком простая</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите парольную фразу, если хотите, чтобы Riot сгенерировал ключ восстановления.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите парольную фразу, если хотите, чтобы Element сгенерировал ключ восстановления.</string>
     <string name="keys_backup_no_session_error">Matrix сессия недоступна</string>
 
     <string name="keys_backup_setup_step1_title">Никогда не теряйте зашифрованных сообщений</string>
@@ -1350,10 +1350,10 @@
 Предупреждение: этот файл может быть удален при удалении приложения.</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
-\nЭта ошибка вне контроля Riot. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
+\nЭта ошибка вне контроля Element. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-Эта ошибка вне контроля Riot. Причины могут быть разными. Возможно, это будет работать, если вы повторите попытку позже, вы также можете проверить, что службы Google Play не ограничены в использовании данных в настройках системы, или что часы вашего устройства установлены правильно, или это может произойти на модифицированных прошивках.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] Эта ошибка вне контроля Riot, и, по словам Google, эта ошибка означает, что на устройстве слишком много приложений, зарегистрированных в FCM. Ошибка возникает только в тех случаях, когда существует огромное количество приложений, поэтому она не должна влиять на обычного пользователя.</string>
+Эта ошибка вне контроля Element. Причины могут быть разными. Возможно, это будет работать, если вы повторите попытку позже, вы также можете проверить, что службы Google Play не ограничены в использовании данных в настройках системы, или что часы вашего устройства установлены правильно, или это может произойти на модифицированных прошивках.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] Эта ошибка вне контроля Element, и, по словам Google, эта ошибка означает, что на устройстве слишком много приложений, зарегистрированных в FCM. Ошибка возникает только в тех случаях, когда существует огромное количество приложений, поэтому она не должна влиять на обычного пользователя.</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Ваши зашифрованные сообщения будут потеряны, если выйдете сейчас</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Выполняется резервное копирование ключа. Если выйти сейчас, Вы потеряете доступ к Вашим зашифрованным сообщениям.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Мне не нужны мои зашифрованные сообщения</string>
@@ -1483,7 +1483,7 @@
 
     <string name="autodiscover_invalid_response">Ошибка отклика сервера</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Дополнить параметры сервера</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot обнаружил пользовательскую конфигурацию сервера для вашего userID домена\"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element обнаружил пользовательскую конфигурацию сервера для вашего userID домена\"%1$s\":
 \n%2$s</string>
     <string name="sas_verify_title">Проверьте, сравнив короткую текстовую строку.</string>
     <string name="sas_security_advise">Для обеспечения максимальной безопасности мы рекомендуем делать это лично или использовать другие надежные средства связи.</string>
@@ -1594,7 +1594,7 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">Произошла ошибка при получении ключей резервного копирования данных</string>
 
     <string name="alpha_disclaimer_title">Добро пожаловать в бету!</string>
-    <string name="alpha_disclaimer_content_line_1">Пока RiotX находится в ранней стадии разработки, некоторые функции могут отсутствовать и вы можете столкнуться с ошибками.</string>
+    <string name="alpha_disclaimer_content_line_1">Пока Element находится в ранней стадии разработки, некоторые функции могут отсутствовать и вы можете столкнуться с ошибками.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">Последний список функций всегда находится в %1$s, и если вы найдете ошибку, пожалуйста, отправьте отчет в верхнее левое меню Home, и мы исправим их так быстро, как только сможем.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Описание магазина</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Если вы обнаружите ошибку, пожалуйста, отправьте сообщение в верхнее левое меню Home, и мы исправим ее так быстро, как только сможем.</string>
@@ -1633,17 +1633,17 @@
 
     <string name="settings_labs_show_hidden_events_in_timeline">Показать скрытые события в ленте сообщений</string>
 
-    <string name="store_riotx_title">RiotX - Matrix клиент следующего поколения</string>
+    <string name="store_riotx_title">Element - Matrix клиент следующего поколения</string>
     <string name="store_riotx_short_description">Быстрый и легкий клиент для Matrix с новейшими фреймворками Android</string>
-    <string name="store_riotx_full_description">RiotX - это новый клиент для протокола Matrix (Matrix.org): открытой сети для безопасного децентрализованного общения. RiotX - это переписанный с нуля клиент Riot для Android, основанный на полностью переписанном Matrix Android SDK.
+    <string name="store_riotx_full_description">Element - это новый клиент для протокола Matrix (Matrix.org): открытой сети для безопасного децентрализованного общения. Element - это переписанный с нуля клиент Riot для Android, основанный на полностью переписанном Matrix Android SDK.
 \n 
-\nПредупреждение: это бета-версия. В настоящее время RiotX находится в активной разработке и содержит ограничения и ошибки (надеемся, не слишком много). Мы будем рады любым отзывам!
+\nПредупреждение: это бета-версия. В настоящее время Element находится в активной разработке и содержит ограничения и ошибки (надеемся, не слишком много). Мы будем рады любым отзывам!
 \n 
-\nRiotX поддерживает: • Вход в существующую учетную запись • Создание и вход в публичные комнаты • Принятие и отклонение приглашений • Просмотр списка комнат • Просмотр сведений о комнате • Отправку текстовых сообщений • Отправку файлов • Чтение и отправку сообщений в зашифрованных комнатах • Криптографию: резервное копирование ключей E2E, улучшенную проверку устройств, запрос и ответ на запрос ключей • Пуш-уведомления • Светлые, тёмные и черные темы
+\nElement поддерживает: • Вход в существующую учетную запись • Создание и вход в публичные комнаты • Принятие и отклонение приглашений • Просмотр списка комнат • Просмотр сведений о комнате • Отправку текстовых сообщений • Отправку файлов • Чтение и отправку сообщений в зашифрованных комнатах • Криптографию: резервное копирование ключей E2E, улучшенную проверку устройств, запрос и ответ на запрос ключей • Пуш-уведомления • Светлые, тёмные и черные темы
 \n 
-\nНе все функции Riot пока реализованы в RiotX. Основные отсутствующие возможности (скоро появятся!): • Настройки комнаты (список участников и т.п.) • Звонки • Виджеты • …</string>
+\nНе все функции Element пока реализованы в Element. Основные отсутствующие возможности (скоро появятся!): • Настройки комнаты (список участников и т.п.) • Звонки • Виджеты • …</string>
 
-    <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в RiotX пока не поддерживается</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в Element пока не поддерживается</string>
 
     <string name="bottom_action_people_x">Диалоги</string>
 
@@ -1692,7 +1692,7 @@
 
     <string name="widget_integration_review_terms">Для продолжения Вам необходимо принять Условия данного сервиса.</string>
 
-    <string name="security_warning_identity_server">В предыдущих версиях Riot была ошибка безопасности, которая могла дать вашему серверу идентификации (%1$s) доступ к вашей учетной записи. Если вы доверяете %2$s, вы можете проигнорировать это; в противном случае, пожалуйста, выйдите из системы и войдите снова.
+    <string name="security_warning_identity_server">В предыдущих версиях Element была ошибка безопасности, которая могла дать вашему серверу идентификации (%1$s) доступ к вашей учетной записи. Если вы доверяете %2$s, вы можете проигнорировать это; в противном случае, пожалуйста, выйдите из системы и войдите снова.
 \n
 \nПодробнее об этом читайте здесь:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1736,10 +1736,10 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Будет использовать%s в качестве помощника, если ваш домашний сервер не предлагает его (ваш IP-адрес будет доступен во время разговора)</string>
     <string name="invite_no_identity_server_error">Добавьте идентификационный сервер в свои настройки, чтобы выполнить это действие.</string>
     <string name="settings_background_fdroid_sync_mode">Режим фоновой синхронизации (Экспериментальный)</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot будет синхронизироваться в фоновом режиме таким образом, чтобы сохранить ограниченные ресурсы устройства (батарея).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element будет синхронизироваться в фоновом режиме таким образом, чтобы сохранить ограниченные ресурсы устройства (батарея).
 \nВ зависимости от состояния ресурса вашего устройства, синхронизация может быть отложена операционной системой.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot будет синхронизироваться в фоновом режиме периодически в точное время (настраивается).
-\nЭто повлияет на использование радио и батареи, появится постоянное уведомление о том, что Riot прислушивается к событиям.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element будет синхронизироваться в фоновом режиме периодически в точное время (настраивается).
+\nЭто повлияет на использование радио и батареи, появится постоянное уведомление о том, что Element прислушивается к событиям.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Вы не будете уведомлены о входящих сообщениях, когда приложение находится в фоновом режиме.</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nСинхронизация может быть отложена в зависимости от ресурсов (батареи) или состояния устройства (спящий режим).</string>
@@ -1792,7 +1792,7 @@
     <string name="room_widget_open_in_browser">Открыть в браузере</string>
     <string name="room_widget_permission_widget_id">ID виджета</string>
     <string name="room_widget_resource_grant_permission">Принять</string>
-    <string name="settings_add_3pid_flow_not_supported">Вы это не можете делать на мобильном Riot</string>
+    <string name="settings_add_3pid_flow_not_supported">Вы это не можете делать на мобильном Element</string>
     <string name="room_widget_permission_added_by">Этот виджет был добавлен:</string>
     <string name="room_widget_permission_theme">Ваши тема</string>
     <string name="room_widget_permission_room_id">ID комнаты</string>
@@ -1869,7 +1869,7 @@
 
     <string name="login_continue">Продолжить</string>
     <string name="login_connect_to">Подключиться к %1$s</string>
-    <string name="login_connect_to_modular">Подключиться к Modular</string>
+    <string name="login_connect_to_modular">Подключиться к Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Подключиться к пользовательскому серверу</string>
     <string name="login_signup">Зарегистрироваться</string>
     <string name="login_signin">Войти в систему</string>
@@ -1878,7 +1878,7 @@
     <string name="login_server_url_form_modular_hint">Модульный адрес</string>
     <string name="login_server_url_form_other_hint">Адрес</string>
     <string name="login_server_url_form_modular_text">Премиум-хостинг для организаций</string>
-    <string name="login_server_url_form_modular_notice">Введите адрес Modular Riot или сервера, который вы хотите использовать.</string>
+    <string name="login_server_url_form_modular_notice">Введите адрес Modular Element или сервера, который вы хотите использовать.</string>
     <string name="login_sso_error_message">Произошла ошибка при загрузке страницы: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Приложение не может войти на этот сервер, так как он поддерживает следующие типы входа: %1$s.
 \nВы хотите войти с помощью веб-клиента\?</string>
@@ -1946,7 +1946,7 @@
 \nОстановить процесс регистрации\?</string>
 
     <string name="login_a11y_choose_matrix_org">Выбрать matrix.org</string>
-    <string name="login_a11y_choose_modular">Выбрать modular</string>
+    <string name="login_a11y_choose_modular">Выбрать Element Matrix Services</string>
     <string name="login_a11y_choose_other">Выбрать другой сервер</string>
     <string name="login_a11y_captcha_container">Пожалуйста, пройдите проверку капчей</string>
     <string name="login_terms_title">Примите условия для продолжения</string>
@@ -1990,7 +1990,7 @@
 \nВойдите заново, чтобы получить доступ к данным своей учётной записи и сообщениям.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Вы потеряете доступ к защищённым сообщениям, если не войдёте в систему для восстановления ключей шифрования.</string>
     <string name="soft_logout_clear_data_dialog_submit">Очистить данные</string>
-    <string name="soft_logout_sso_not_same_user_error">Текущая сессия предназначена для пользователя %1$s, а вы предоставляете учётные данные для пользователя %2$s. Это не поддерживается в RiotX. 
+    <string name="soft_logout_sso_not_same_user_error">Текущая сессия предназначена для пользователя %1$s, а вы предоставляете учётные данные для пользователя %2$s. Это не поддерживается в Element.
 \nПожалуйста, сначала очистите данные, а затем снова войдите под другим аккаунтом.</string>
 
     <string name="permalink_malformed">Ваша ссылка на matrix.to неверна</string>
@@ -2124,7 +2124,7 @@
     <string name="one_user_read">%s прочитано</string>
     <string name="error_handling_incoming_share">Не удалось обработать данные</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot требуются права для сохранения ваших ключей шифрования на диск.
+    <string name="permissions_rationale_msg_keys_backup_export">Element требуются права для сохранения ваших ключей шифрования на диск.
 \n
 \nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы экспортировать ключи вручную.</string>
 
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 747c8a739e..fd0a38e2f7 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -83,7 +83,7 @@
     <string name="user_directory_header">Adresár používateľov</string>
     <string name="matrix_only_filter">Len Matrix kontakty</string>
     <string name="no_conversation_placeholder">Žiadne konverzácie</string>
-    <string name="no_contact_access_placeholder">Aplikácii Riot ste nepovolili prístup k lokálnym kontaktom</string>
+    <string name="no_contact_access_placeholder">Aplikácii Element ste nepovolili prístup k lokálnym kontaktom</string>
     <string name="no_result_placeholder">Žiadne výsledky</string>
 
     <string name="rooms_header">Miestnosti</string>
@@ -103,7 +103,7 @@
     <string name="send_bug_report">Nahlásiť chybu</string>
     <string name="send_bug_report_description">Prosím, Napíšte text hlásenia. Čo ste práve robili? Čo ste očakávali? Čo sa v skutočnosti udialo?</string>
     <string name="send_bug_report_placeholder">Tu popíšte váš problém</string>
-    <string name="send_bug_report_logs_description">S cieľom lepšej diagnostiky problému sa spolu s vašim hlásením odošlú záznami o činnosti programu Riot. Toto hlásenie vrátane priložených záznamov a snímky obrazovky nebude verejne dostupné. Ak si želáte odoslať len text hlásenia, odškrtnite niektoré z nasledujúcich polí:</string>
+    <string name="send_bug_report_logs_description">S cieľom lepšej diagnostiky problému sa spolu s vašim hlásením odošlú záznami o činnosti programu Element. Toto hlásenie vrátane priložených záznamov a snímky obrazovky nebude verejne dostupné. Ak si želáte odoslať len text hlásenia, odškrtnite niektoré z nasledujúcich polí:</string>
     <string name="send_bug_report_alert_message">Zdá sa, že v zlosti trasiete zariadením. Chceli by ste odoslať hlásenie o chybe?</string>
     <string name="send_bug_report_app_crashed">Posledné spustenie aplikácie skončilo pádom. Chceli by ste odoslať hlásenie o chybe?</string>
 
@@ -237,24 +237,24 @@ Emailovú adresu si môžete k účtu pridať neskôr cez nastavenia.</string>
     <string name="media_picker_cannot_record_video">Nie je možné nahrať video</string>
 
     <string name="permissions_rationale_popup_title">Informácia</string>
-    <string name="permissions_rationale_msg_storage">Aby ste mohli posielať a prijímať súbory, Riot potrebuje prístup k fotkám, videám a súborom vo vašom zariadení.
+    <string name="permissions_rationale_msg_storage">Aby ste mohli posielať a prijímať súbory, Element potrebuje prístup k fotkám, videám a súborom vo vašom zariadení.
 
 Prosím, povoľte prístup na nasledujúcej obrazovke.</string>
-    <string name="permissions_rationale_msg_camera">Aby ste mohli fotiť obrázky a videá a tiež uskutočňovať video hovory, Riot potrebuje prístup k fotoaparátu.</string>
+    <string name="permissions_rationale_msg_camera">Aby ste mohli fotiť obrázky a videá a tiež uskutočňovať video hovory, Element potrebuje prístup k fotoaparátu.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nProsím, povoľte prístup na nasledujúcej obrazovke, aby ste mohli uskutočniť hovor."</string>
-    <string name="permissions_rationale_msg_record_audio">Aby ste mohli uskutočňovať audio hovory, Riot potrebuje prístup k mikrofónu vašeho zariadenia.</string>
+    <string name="permissions_rationale_msg_record_audio">Aby ste mohli uskutočňovať audio hovory, Element potrebuje prístup k mikrofónu vašeho zariadenia.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nProsím, povoľte prístup na nasledujúcej obrazovke, aby ste mohli uskutočniť hovor."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Aby ste mohli uskutočňovať video hovory, Riot potrebuje prístup k fotoaparátu a mikrofónu vašeho zariadenia.
+    <string name="permissions_rationale_msg_camera_and_audio">Aby ste mohli uskutočňovať video hovory, Element potrebuje prístup k fotoaparátu a mikrofónu vašeho zariadenia.
 
 Prosím, povoľte prístup na nasledujúcich obrazovkách.</string>
-    <string name="permissions_rationale_msg_contacts">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, Riot potrebuje prístup k vašim kontaktom. Ak si prajete zdieľať váš zoznam kontaktov za týmto účelom, prosím, povoľte prístup na nasledujúcej obrazovke.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, Riot potrebuje prístup k vašim kontaktom.
+    <string name="permissions_rationale_msg_contacts">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, Element potrebuje prístup k vašim kontaktom. Ak si prajete zdieľať váš zoznam kontaktov za týmto účelom, prosím, povoľte prístup na nasledujúcej obrazovke.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, Element potrebuje prístup k vašim kontaktom.
 
-Chcete aplikácii Riot povoliť prístup k vašim kontaktom?</string>
+Chcete aplikácii Element povoliť prístup k vašim kontaktom?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Prepáčte, akcia nebola vykonaná kvôli chýbajúcim oprávneniam</string>
 
@@ -610,7 +610,7 @@ Pozor! Vykonaním tejto akcie reštartujete aplikáciu a opätovné načítanie
     <string name="passphrase_confirm_passphrase">Potvrďte heslo</string>
     <string name="encryption_export_saved_as">Šifrovacie kľúče miestností boli uložené do %s
 
-Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikácii Riot.</string>
+Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikácii Element.</string>
 
     <string name="encryption_import_e2e_room_keys">Importovať E2E kľúče miestností</string>
     <string name="encryption_import_room_keys">Importovať kľúče miestností</string>
@@ -636,7 +636,7 @@ Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikác
     <string name="encryption_information_verify_device_warning2">Ak sa kľúče zhodujú, stlačte tlačidlo Overiť nižšie. Ak sa nezhodujú, niekto ďalší odpočúva toto zariadenie a mali by ste ho pridať na čiernu listinu.</string>
     <string name="encryption_information_verify_key_match">Overil som, kľúče sa zhodujú</string>
 
-    <string name="e2e_enabling_on_app_update">Riot od teraz podporuje E2E šifrovanie. Ak si ho želáte povoliť, musíte sa teraz odhlásiť a následne prihlásiť znovu.
+    <string name="e2e_enabling_on_app_update">Element od teraz podporuje E2E šifrovanie. Ak si ho želáte povoliť, musíte sa teraz odhlásiť a následne prihlásiť znovu.
 
 Môžete to urobiť teraz, alebo to môžete urobiť neskôr v časti Nastavenia.</string>
 
@@ -865,7 +865,7 @@ Môžete to urobiť teraz, alebo to môžete urobiť neskôr v časti Nastavenia
     <string name="settings_notification_privacy_message_content_not_shown">• Súčasťou oznámení <b>nebude zobrazený obsah správ</b></string>
 
     <string name="startup_notification_privacy_title">Súkromie oznámení</string>
-    <string name="startup_notification_privacy_message">Riot môže fungovať na pozadí aby spracovával vaše upozornenia bezpečne a v súkromí. Môže to ovplyvniť využitie batérie.</string>
+    <string name="startup_notification_privacy_message">Element môže fungovať na pozadí aby spracovával vaše upozornenia bezpečne a v súkromí. Môže to ovplyvniť využitie batérie.</string>
     <string name="startup_notification_privacy_button_grant">Udeliť oprávnenie</string>
     <string name="startup_notification_privacy_button_other">Vyberte inú voľbu</string>
 
@@ -880,8 +880,8 @@ Môžete to urobiť teraz, alebo to môžete urobiť neskôr v časti Nastavenia
     <string name="settings_deactivate_my_account">Deaktivovať môj účet</string>
 
     <string name="settings_opt_in_of_analytics">Odosielať analytické údaje</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot zbiera anonymné analytické údaje, čo nám umožňuje aplikáciu ďalej zlepšovať.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Prosím povoľte odosielanie analytických údajov a pomôžte nám tak vylepšovať Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element zbiera anonymné analytické údaje, čo nám umožňuje aplikáciu ďalej zlepšovať.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Prosím povoľte odosielanie analytických údajov a pomôžte nám tak vylepšovať Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Áno, chcem pomôcť!</string>
 
     <string name="widget_integration_missing_parameter">Chýba zadanie povinného argumentu.</string>
@@ -911,7 +911,7 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
 
     <string name="e2e_re_request_encryption_key">Znovu požiadať o šifrovacie kľúče z vašich ostatných relácií.<u>Znovu požiadať o šifrovacie kľúče</u> z vašich ostatných zariadení.</string>
 
-    <string name="e2e_re_request_encryption_key_dialog_content">Prosím spustite Riot na inom zariadení, ktoré je schopné dešifrovať túto správu, čím sa automaticky spustí prenos chýbajúcich kľúčov na túto reláciu.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Prosím spustite Element na inom zariadení, ktoré je schopné dešifrovať túto správu, čím sa automaticky spustí prenos chýbajúcich kľúčov na túto reláciu.</string>
 
     <string name="option_send_voice">Odoslať hlasovú správu</string>
 
@@ -1046,7 +1046,7 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
     <string name="auth_accept_policies">Prosím prečítajte si a odsúhlaste zmluvné podmienky tohoto domovského servera:</string>
 
     <string name="settings_call_category">Hovory</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Použiť predvolené zvonenie Riot pre prichádzajúce hovory</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Použiť predvolené zvonenie Element pre prichádzajúce hovory</string>
     <string name="settings_call_ringtone_title">Zvonenie pre prichádzajúci hovor</string>
     <string name="settings_call_ringtone_dialog_title">Vyberte zvonenie pre prichádzajúce hovory:</string>
 
@@ -1078,12 +1078,12 @@ Prosím, skontrolujte nastavenia účtu.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Nastavenia relácií.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Oznámenia sú povolené pre túto reláciu.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Oznámenia nie sú povolené pre túto reláciu.
-\nProsím, skontrolujte nastavenia Riotu.</string>
+\nProsím, skontrolujte nastavenia Elementu.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Povoliť</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Kontrola aplikácii Služby Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">Aplikácia Služby Google Playje k dispozícii a aktualizovaná.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot používa aplikáciu Služby Google Play na doručovanie oznámení. No zdá sa, že táto nie je správne nakonfigurovaná:
+    <string name="settings_troubleshoot_test_play_services_failed">Element používa aplikáciu Služby Google Play na doručovanie oznámení. No zdá sa, že táto nie je správne nakonfigurovaná:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Opraviť Služby Play</string>
 
@@ -1110,19 +1110,19 @@ Prosím skúste reštartovať aplikáciu.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Spustenie po zapnutí</string>
     <string name="settings_troubleshoot_test_service_boot_success">Služba sa automaticky spustí po reštarte zariadenia.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Služba sa automaticky nespustí po reštarte zariadenia a nedostanete po reštarte žiadne oznámenia, kým nespustíte Riot aspoň raz.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Služba sa automaticky nespustí po reštarte zariadenia a nedostanete po reštarte žiadne oznámenia, kým nespustíte Element aspoň raz.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Povoliť spustenie služby po reštarte</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Kontrola obmedzenia spustenia na pozadí</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Obmedzenie spustenia na pozadí nie je aktívne pre Riot. Tento test je potrebné spustiť cez mobilné dáta (nie cez wifi).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Obmedzenie spustenia na pozadí nie je aktívne pre Element. Tento test je potrebné spustiť cez mobilné dáta (nie cez wifi).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Obmedzenie spustenia na pozadí je aktívne pre Riot.
-Činnosť aplikácii bude agresívne obmedzovaná operačným systémom, keď je Riot na pozadí. Môže to mať negatívny vplyv na doručovanie oznámení.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Obmedzenie spustenia na pozadí je aktívne pre Element.
+Činnosť aplikácii bude agresívne obmedzovaná operačným systémom, keď je Element na pozadí. Môže to mať negatívny vplyv na doručovanie oznámení.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Deaktivovať obmedzenia</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimalizácia batérie</string>
-    <string name="settings_troubleshoot_test_battery_success">Chod Riot nie je ovplyvnený nastavením optimalizácie batérie.</string>
+    <string name="settings_troubleshoot_test_battery_success">Chod Element nie je ovplyvnený nastavením optimalizácie batérie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ak používateľ na nejaký čas ponechá zariadenie s vypnutou obrazovkou odložené odpojené od napájania, na zariadení sa použije režim Doze. Toto aplikáciám zabráni pristupovať k sieti, pozastaví ich naplánované úlohy, synchronizáciu aj bežné signály.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorovať optimalizáciu</string>
 
@@ -1138,8 +1138,8 @@ Prosím skúste reštartovať aplikáciu.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Zobrazovať udalosti účtu</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Zahŕňa zmeny zobrazovaného mena a obrázka v profile.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Pripojenie na pozadí</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot potrebuje na pozadí udržovať aktívne nenáročné spojenie, aby spoľahlivo fungovali oznámenia.
-Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí pre Riot. Prosím povoľte ho.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element potrebuje na pozadí udržovať aktívne nenáročné spojenie, aby spoľahlivo fungovali oznámenia.
+Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí pre Element. Prosím povoľte ho.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Udeliť oprávnenie</string>
 
     <string name="account_email_error">Pri pokuse overiť vašu emailovú adresu sa vyskytla chyba.</string>
@@ -1159,20 +1159,20 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
 
     <string name="no_valid_google_play_services_apk">Nenájdená aktívna aplikácia Služby Google Play. Je možné, že nebude správne fungovať doručovanie oznámení.</string>
 
-    <string name="store_title">Riot.im - Komunikujte, Podľa seba</string>
-    <string name="store_whats_new">"Riot.im neustále aktualizujeme s vylepšeniami a zmenami.
+    <string name="store_title">Element - Komunikujte, Podľa seba</string>
+    <string name="store_whats_new">"Element neustále aktualizujeme s vylepšeniami a zmenami.
 Podrobný zoznam zmien (anglicky) nájdete na adrese: %1$s.
 Aby ste nič nezmeškali, nevypínajte prosím automatické aktualizácie."</string>
     <string name="store_short_description">Univerzálna a bezpečná aplikácia na okamžitú komunikáciu úplne pod vašou kontrolou.</string>
-    <string name="store_full_description">Četovacia aplikácia, pod vašou kontrolou a úplne flexibilná. Riot vám umožňuje komunikovať presne tak, ako to vy chcete. Vytvorená pre [matrix] - štandard pre otvorenú, decentralizovanú komunikáciu.
+    <string name="store_full_description">Četovacia aplikácia, pod vašou kontrolou a úplne flexibilná. Element vám umožňuje komunikovať presne tak, ako to vy chcete. Vytvorená pre [matrix] - štandard pre otvorenú, decentralizovanú komunikáciu.
 \n
 \nZaložte si bezplatný účet u matrix.org, založte si svoj server na https://modular.im alebo použite iný Matrix server.
 \n
-\nPrečo si vybrať Riot.im\?
+\nPrečo si vybrať Element\?
 \n
 \n• KOMPLETNÁ KOMUNIKÁCIA: Vytvárajte miestnosti pre vaše týmy, priateľov či komunity - akokoľvek chcete! Píšte si, zdieľajte súbory, pridávajte widgety a uskutočňujte hlasové hovory či video-hovory - všetko bezplatne.
 \n
-\n• INTEGRÁCIE: Používajte Riot.im s nástrojmi, ktoré poznáte a s obľubou používate. S Riot.im môžete taktiež komunikovať s používateľmi a skupinami na iných četovacích platformách.
+\n• INTEGRÁCIE: Používajte Element s nástrojmi, ktoré poznáte a s obľubou používate. S Element môžete taktiež komunikovať s používateľmi a skupinami na iných četovacích platformách.
 \n
 \n• SÚKROMNÝ A ZABEZPEČENÝ: Udržte si svoje konverzácie tajné. Špičkové end-to-end šifrovanie zaručí, že súkromné konverzácie ostanú súkromnými.
 \n
@@ -1217,11 +1217,11 @@ Aby ste nič nezmeškali, nevypínajte prosím automatické aktualizácie."</str
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Skontrolovať nastavenia</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nNa zariadení máte množstvo aplikácií zaregistrovaných na doručovanie okamžitých oznámení cez služby Google play. Konfigurácia Riot nemá vplyv na výskyt tejto chyby. Podľa Google sa môže vyskytovať len pri veľmi vysokom počte nainštalovaných aplikácií. Bežní používatelia by týmto nemali byť postihnutí.</string>
+\nNa zariadení máte množstvo aplikácií zaregistrovaných na doručovanie okamžitých oznámení cez služby Google play. Konfigurácia Element nemá vplyv na výskyt tejto chyby. Podľa Google sa môže vyskytovať len pri veľmi vysokom počte nainštalovaných aplikácií. Bežní používatelia by týmto nemali byť postihnutí.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nKonfigurácia Riot nemá vplyv na zobrazenie tejto chyby. Táto chyba sa môže zobraziť z niekoľkých dôvodov. Uistite sa že máte správne nastavený systémový čas a že ste v nastaveniach systému aplikácii služby Google play neobmedzili používanie prístupu na internet. Chyba sa tiež môže zobrazovať na vlastných zostaveniach (ROM), alebo sa chyba môže samovoľne prestať zobrazovať neskôr.</string>
+\nKonfigurácia Element nemá vplyv na zobrazenie tejto chyby. Táto chyba sa môže zobraziť z niekoľkých dôvodov. Uistite sa že máte správne nastavený systémový čas a že ste v nastaveniach systému aplikácii služby Google play neobmedzili používanie prístupu na internet. Chyba sa tiež môže zobrazovať na vlastných zostaveniach (ROM), alebo sa chyba môže samovoľne prestať zobrazovať neskôr.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nV zariadení nemáte nastavený účet Google. Prosím, pridajte si účet cez správcu účtov. Konfigurácia Riot nemá vplyv na zobrazenie tejto chyby.</string>
+\nV zariadení nemáte nastavený účet Google. Prosím, pridajte si účet cez správcu účtov. Konfigurácia Element nemá vplyv na zobrazenie tejto chyby.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Pridať účet</string>
 
     <string name="settings_notification_privacy_no_background_sync">Aplikácia sa <b>nepotrebuje</b> pripájať k domovskému serveru, keď beží na pozadí, čo môže predĺžiť výdrž batérie</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index e0755b04f9..eae67a0c3e 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -729,7 +729,7 @@
     <string name="ongoing_conference_call_video">Video</string>
     <string name="missing_permissions_to_start_conf_call">Ju duhen leje për ftesa, që të nisni një konferencë në këtë dhomë</string>
     <string name="bottom_action_favourites">Të parapëlqyer</string>
-    <string name="no_contact_access_placeholder">S’e lejuat Riot-in të hyjë në kontaktet tuaja vendore</string>
+    <string name="no_contact_access_placeholder">S’e lejuat Element-in të hyjë në kontaktet tuaja vendore</string>
     <string name="send_bug_report_description">Ju lutemi, përshkruajeni të metën. Ç’po bënit? Ç’prisnit të ndodhte? Ç’ndodhi në fakt?</string>
     <string name="send_bug_report_alert_message">Duket se po përplasni telefonin nga inati. Do të donit të hapej skena për njoftim të metash?</string>
     <string name="send_bug_report_app_crashed">Herën e fundit aplikacioni u vithis. Do të donit të hapej skena e raportimit të vithisjeve?</string>
@@ -746,7 +746,7 @@
 \n
 \nËshtë bërë dalja juaj nga llogaria në krejt sesionet dhe s’do të merrni më njoftime push. Për riaktivizim të njoftimeve, ribëni hyrjen në çdo pajisje.</string>
 
-    <string name="e2e_re_request_encryption_key_dialog_content">Ju lutemi, niseni Riot-in në një tjetër pajisje që mund të shfshehtëzojë mesazhin, që kështu të mund të dërgojë kyçet te ky sesion.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Ju lutemi, niseni Element-in në një tjetër pajisje që mund të shfshehtëzojë mesazhin, që kështu të mund të dërgojë kyçet te ky sesion.</string>
 
     <string name="call_error_ice_failed">Lidhja e Medias Dështoi</string>
     <string name="media_picker_cannot_record_video">S’regjistrohet dot video</string>
@@ -774,7 +774,7 @@
     <string name="room_settings_addresses_e2e_encryption_warning">Aktivizo fshehtëzim 
 \n(kujdes: s’mund të çaktivizohet më!)</string>
 
-    <string name="e2e_enabling_on_app_update">Riot tani mbulon fshehtëzim skaj-më-skaj, por lypset të ribëni hyrjen që ta aktivizoni.
+    <string name="e2e_enabling_on_app_update">Element tani mbulon fshehtëzim skaj-më-skaj, por lypset të ribëni hyrjen që ta aktivizoni.
 \n
 \nMund ta bëni tani ose më vonë, që prej rregullimeve të aplikacionit.</string>
 
@@ -835,22 +835,22 @@
     <string name="call_connected">U bë lidhja e thirrjes</string>
     <string name="call_connecting">Po bëhet lidhja e thirrjes…</string>
     <string name="call_error_user_not_responding">Ana e largët dështoi të përgjigjet.</string>
-    <string name="permissions_rationale_msg_storage">Për të dërguar dhe ruajtur bashkëngjitje, Riot-i lyp leje të përdorë mediatekën tuaj.
+    <string name="permissions_rationale_msg_storage">Për të dërguar dhe ruajtur bashkëngjitje, Element-i lyp leje të përdorë mediatekën tuaj.
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluska pasuese, që të jetë në gjendje të dërgojë kartela që nga telefoni juaj.</string>
-    <string name="permissions_rationale_msg_camera">Për të bërë foto dhe thirrje video, Riot-i lyp leje të përdorë kamerën tuaj.</string>
+    <string name="permissions_rationale_msg_camera">Për të bërë foto dhe thirrje video, Element-i lyp leje të përdorë kamerën tuaj.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluska pasuese, që të jetë në gjendje të bëjë thirrjen."</string>
-    <string name="permissions_rationale_msg_record_audio">Për të kryer thirrje audio, Riot-i lyp leje të përdorë mikrofonin tuaj.</string>
+    <string name="permissions_rationale_msg_record_audio">Për të kryer thirrje audio, Element-i lyp leje të përdorë mikrofonin tuaj.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluska pasuese, që të jetë në gjendje të bëjë thirrjen."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Për të kryer thirrje video, Riot-i lyp leje të përdorë kamerën dhe mikrofonin tuaj.
+    <string name="permissions_rationale_msg_camera_and_audio">Për të kryer thirrje video, Element-i lyp leje të përdorë kamerën dhe mikrofonin tuaj.
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluskat pasuese, që të jetë në gjendje të bëjë thirrjen.</string>
-    <string name="permissions_rationale_msg_contacts">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Riot-i mund të kërkojë në librin tuaj të adresave. Nëse jeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim, ju lutemi, lejojeni hyrjen gjatë flluskës pasuese.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Riot-i mund të kërkojë në librin tuaj të adresave. 
+    <string name="permissions_rationale_msg_contacts">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Element-i mund të kërkojë në librin tuaj të adresave. Nëse jeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim, ju lutemi, lejojeni hyrjen gjatë flluskës pasuese.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Element-i mund të kërkojë në librin tuaj të adresave.
 \n 
 \nJeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim\?</string>
 
@@ -958,9 +958,9 @@
     <string name="settings_send_typing_notifs_summary">Lejojuni përdoruesve të tjerë të dinë se po shtypni.</string>
     <string name="settings_send_markdown_summary">Formatojini mesazhet duke përdorur sintaksën Markdown përpara se të dërgohen. Kjo lejon formatim të thelluar, f.v., përdorimi i yllthit për ta shfaqur tekstin me të pjerrëta.</string>
     <string name="settings_show_join_leave_messages_summary">Nuk prek ftesat, përzëniet dhe dëbimet.</string>
-    <string name="startup_notification_privacy_message">Riot-i mund të xhirojë në prapaskenë që të administrojë njoftimet tuaja në rrugë të sigurt dhe privatisht. Kjo mund të ndikojë në harxhimin e baterisë.</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Ju lutemi, aktivizoni analizat që të na ndihmoni të përmirësojmë Riot-in.</string>
+    <string name="startup_notification_privacy_message">Element-i mund të xhirojë në prapaskenë që të administrojë njoftimet tuaja në rrugë të sigurt dhe privatisht. Kjo mund të ndikojë në harxhimin e baterisë.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Ju lutemi, aktivizoni analizat që të na ndihmoni të përmirësojmë Element-in.</string>
     <string name="settings_unignore_user">Të shfaqen krejt mesazhet prej %s\?
 \n
 \nKini parasysh që ky veprim do të sjellë rinisjen e aplikacionit dhe mund të hajë ca kohë.</string>
@@ -990,7 +990,7 @@
     <string name="option_send_sticker">Dërgoni një ngjitës</string>
     <string name="go_on_with">vazhdoni me…</string>
     <string name="settings_call_category">Thirrje</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Për thirrje ardhëse përdor zilen parazgjedhje të Riot-it</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Për thirrje ardhëse përdor zilen parazgjedhje të Element-it</string>
     <string name="settings_call_ringtone_title">Zile thirrjesh ardhëse</string>
     <string name="settings_call_ringtone_dialog_title">Përzgjidhni zile për thirrjet:</string>
 
@@ -1028,12 +1028,12 @@
     <string name="settings_troubleshoot_test_device_settings_title">Rregullime Sesioni.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Njoftimet janë të aktivizuara për këtë sesion.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Nuk janë aktivizuar njoftimet për këtë sesion. 
-\nJu lutemi, kontrolloni rregullimet e Riot-it.</string>
+\nJu lutemi, kontrolloni rregullimet e Element-it.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktivizoje</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Kontroll pë Play Services</string>
     <string name="settings_troubleshoot_test_play_services_success">APK-ja për Google Play Services është e pranishme dhe e përditësuar.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot-i përdor Google Play Services për të dorëzuar mesazhe push, por s’duket të jetë formësuar saktë:
+    <string name="settings_troubleshoot_test_play_services_failed">Element-i përdor Google Play Services për të dorëzuar mesazhe push, por s’duket të jetë formësuar saktë:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Ndreqni Play Services</string>
 
@@ -1060,25 +1060,25 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Nise gjatë nisjes së sistemit</string>
     <string name="settings_troubleshoot_test_service_boot_success">Shërbimi do të niset kur të riniset pajisja.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Shërbimi s’do të niset kur të riniset pajisja, s’do të merrni njoftime derisa Riot-i të jetë hapur një herë.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Shërbimi s’do të niset kur të riniset pajisja, s’do të merrni njoftime derisa Element-i të jetë hapur një herë.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktivizo Nisje gjatë nisjes së sistemit</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Kontrollo kufizime prapaskene</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Kufizimet për në prapaskenë janë të çaktivizuar për Riot-in. Ky test duhet të xhirojë duke përdorur të dhëna rrjeti celular (jo WIFI).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Kufizimet për në prapaskenë janë të çaktivizuar për Element-in. Ky test duhet të xhirojë duke përdorur të dhëna rrjeti celular (jo WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Kufizimet për në prapaskenë janë të aktivizuara për Riot-in.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Kufizimet për në prapaskenë janë të aktivizuara për Element-in.
 \nPuna që aplikacioni rreket të bëjë do të kufizohet në mënyrë agresive, teksa gjendet në prapaskenë, dhe kjo mund të prekë njoftimet.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Çaktivizoji kufizimet</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimizim Baterie</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot-i nuk preket nga Optimizime Baterie.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element-i nuk preket nga Optimizime Baterie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Nëse një përdorues e lë një pajisje jo në prizë dhe të palëvizshme për një periudhë, me ekranin të fikur, pajisja kalon nën mënyrën Dremitje. Kjo u parandalon aplikimeve të hyjnë në rrjet dhe shtyn për më vonë punët e tyre, njëkohësimet dhe alarmet standarde.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Shpërfille Optimizimin</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Lidhje Në Prapaskenë</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Për t’ju dhënë njoftime të qëndrueshme, Riot-i lyp të mbajë në prapaskenë një lidhje me pak ndikim.
-\nNë skenën pasuese do t’ju kërkohet të lejoni Riot-in të xhirojë në prapaskenë, ju lutemi, pranojeni.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Për t’ju dhënë njoftime të qëndrueshme, Element-i lyp të mbajë në prapaskenë një lidhje me pak ndikim.
+\nNë skenën pasuese do t’ju kërkohet të lejoni Element-in të xhirojë në prapaskenë, ju lutemi, pranojeni.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Akordojini leje</string>
 
     <string name="account_email_error">Ndodhi një gabim teksa verifikohej adresa juaj email.</string>
@@ -1088,17 +1088,17 @@
 
     <string name="no_valid_google_play_services_apk">S’u gjet APK për Google Play Services. Njoftimet mund të mos punojnë saktë.</string>
 
-    <string name="store_title">Riot.im - Komunikoni, sipas mënyrës tuaj</string>
+    <string name="store_title">Element - Komunikoni, sipas mënyrës tuaj</string>
     <string name="store_short_description">Një aplikacion universal i sigurt bisedash, tërësisht nën kontrollin tuaj.</string>
-    <string name="store_full_description">Një aplikacion fjalosjesh, nën kontrollin tuaj dhe plotësisht i zhdërvjellët. Riot-i ju lejon të komunikoni sipas mënyrës që doni. I krijuar për [matrix] - standardi për komunikime të hapura, të decentralizuara.
+    <string name="store_full_description">Një aplikacion fjalosjesh, nën kontrollin tuaj dhe plotësisht i zhdërvjellët. Element-i ju lejon të komunikoni sipas mënyrës që doni. I krijuar për [matrix] - standardi për komunikime të hapura, të decentralizuara.
 \n
 \nMerrni një llogari matrix.org falas, merrni shërbyesin tuaj te https://modular.im, ose përdorni një tjetër shërbyes Matrix.
 \n
-\nPse të zgjidhet Riot.im\?
+\nPse të zgjidhet Element\?
 \n
 \n• KOMUNIKIM I PLOTË: Krijoni dhoma rreth ekipeve tuaj, shokëve tuaj, bashkësisë tuaj - ç’të doni! Llafosuni, shkëmbeni kartela, shtoni widget-e dhe bëni thirrje me zë dhe figurë - gjithçka falas.
 \n
-\n• INTEGRIME TË FUQISHME: Përdoreni Riot.im me mjete që njihni dhe që i doni. Me Riot.im mundeni madje edhe të bisedoni me përdorues dhe grupe nën aplikacione të tjera fjalosjesh.
+\n• INTEGRIME TË FUQISHME: Përdoreni Element me mjete që njihni dhe që i doni. Me Element mundeni madje edhe të bisedoni me përdorues dhe grupe nën aplikacione të tjera fjalosjesh.
 \n
 \n• PRIVAT DHE I SIGURT: Mbajini bisedat tuaja të fshehta. Fshehtëzimi skaj-më-skaj i fjalës së fundit garanton që komunikimet private të mbeten private.
 \n
@@ -1108,7 +1108,7 @@
 
     <string name="video_call_in_progress">Thirrje Video Në Kryerje e Sipër…</string>
 
-    <string name="store_whats_new">"Bëjmë përherë ndryshime dhe përmirësime te Riot.im.
+    <string name="store_whats_new">"Bëjmë përherë ndryshime dhe përmirësime te Element.
 Regjistri i plotë i ndryshimeve mund të gjendet këtu: %1$s.
 Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekanizmin e përditësimeve."</string>
     <string name="title_activity_keys_backup_setup">Kopjeruajtje Kyçesh</string>
@@ -1129,11 +1129,11 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Kontrolloni Rregullimet</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nKy gabim është jashtë kontrollit të Riot-it dhe, sipas Google-it, ky gabim është shenjë se pajisja ka shumë aplikacione të regjistruar me FCM. Gabimi ndodh vetëm në raste kur ka një numër të skajshëm aplikacionesh, ndaj nuk duhet të prekë përdoruesin mesatar.</string>
+\nKy gabim është jashtë kontrollit të Element-it dhe, sipas Google-it, ky gabim është shenjë se pajisja ka shumë aplikacione të regjistruar me FCM. Gabimi ndodh vetëm në raste kur ka një numër të skajshëm aplikacionesh, ndaj nuk duhet të prekë përdoruesin mesatar.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nKy gabim është jashtë kontrollit të Riot-it. Mund të ndodhë për disa arsye. Ndoshta do të funksionojë, nëse riprovoni më vonë, mund të kontrolloni edhe nëse për Google Play Service s’ka kufizime lidhur me përdorimin e të dhënave, te rregullimet e sistemit, ose se ora e pajisjes suaj është e saktë, ose mund të ndodhë në ROM të përshtatur.</string>
+\nKy gabim është jashtë kontrollit të Element-it. Mund të ndodhë për disa arsye. Ndoshta do të funksionojë, nëse riprovoni më vonë, mund të kontrolloni edhe nëse për Google Play Service s’ka kufizime lidhur me përdorimin e të dhënave, te rregullimet e sistemit, ose se ora e pajisjes suaj është e saktë, ose mund të ndodhë në ROM të përshtatur.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nKy gabim është jashtë kontrollit të Riot-it. S’ka llogari Google te telefoni. Ju lutemi, hapni përgjegjësin e llogarive dhe shtoni një llogari Google.</string>
+\nKy gabim është jashtë kontrollit të Element-it. S’ka llogari Google te telefoni. Ju lutemi, hapni përgjegjësin e llogarive dhe shtoni një llogari Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Shtoni Llogari</string>
 
     <string name="settings_noisy_notifications_preferences">Formësoni Njoftime të Zhurmshme</string>
@@ -1149,7 +1149,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="passphrase_empty_error_message">Ju lutemi, jepni një frazëkalim</string>
     <string name="passphrase_passphrase_too_weak">Frazëkalimi është shumë i dobët</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Ju lutemi, fshini frazëkalimin, nëse doni që Riot-i të prodhojë një kyç rimarrjesh.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Ju lutemi, fshini frazëkalimin, nëse doni që Element-i të prodhojë një kyç rimarrjesh.</string>
     <string name="keys_backup_no_session_error">S’ka sesione Matrix të gatshëm</string>
 
     <string name="keys_backup_setup_step1_title">Mos humbni kurrë mesazhe të fshehtëzuar</string>
@@ -1312,7 +1312,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="new_recovery_method_popup_was_me">Unë qeshë</string>
     <string name="autodiscover_invalid_response">Përgjigje e pavlefshme zbulimi shërbyesi Home</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Mundësi Vetëplotësimi Shërbyesi</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot-i pikasi një formësim shërbyesi të përshtatur për përkatësinë tuaj userId \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element-i pikasi një formësim shërbyesi të përshtatur për përkatësinë tuaj userId \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Përdor Formësim</string>
 
@@ -1450,7 +1450,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="group_all_communities">Krejt Bashkësitë</string>
 
     <string name="room_preview_no_preview">Kjo dhomë s’mund të parashihet</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Paraparja e dhomave të lexueshme nga bota nuk mbulohet ende në RiotX</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Paraparja e dhomave të lexueshme nga bota nuk mbulohet ende në Element</string>
 
     <string name="fab_menu_create_room">Dhoma</string>
     <string name="fab_menu_create_chat">Mesazhe të Drejtpërdrejtë</string>
@@ -1467,7 +1467,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="keys_backup_unable_to_get_keys_backup_data">Ndodhi një gabim teksa merreshin të dhëna kopjeruajtjeje kyçesh</string>
 
     <string name="alpha_disclaimer_title">Mirë se vini në beta!</string>
-    <string name="alpha_disclaimer_content_line_1">Teksa RiotX është në fillimet e zhvillimit, disa veçori mund të mos jenë gati dhe mund të hasni të meta.</string>
+    <string name="alpha_disclaimer_content_line_1">Teksa Element është në fillimet e zhvillimit, disa veçori mund të mos jenë gati dhe mund të hasni të meta.</string>
     <string name="alpha_disclaimer_content_line_2_gplay">Lista e veçorive më të reja gjendet te %1$s, dhe nëse gjeni të meta, ju lutemi, parashtroni një njoftim te menuja majtas sipër te Home, dhe do t’i ndreqim sa më shpejt të mundemi.</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Përshkrim në Play Store</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">Nëse gjeni të meta, ju lutemi, parashtroni një njoftim te menuja majtas sipër te Home, dhe do t’i ndreqim sa më shpejt të mundemi.</string>
@@ -1503,15 +1503,15 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="settings_labs_show_hidden_events_in_timeline">Shfaq te rrjedha kohore akte të fshehura</string>
 
-    <string name="store_riotx_title">RiotX - Klient Matrix i Brezit të Ardhshëm</string>
+    <string name="store_riotx_title">Element - Klient Matrix i Brezit të Ardhshëm</string>
     <string name="store_riotx_short_description">Një klient më i shpejtë dhe më i lehtë për Matrix, që përdor mekanizmat më të rinj Android</string>
-    <string name="store_riotx_full_description">RiotX është një klient i ri për protokollin Matrix (Matrix.org): një rrjet i hapur për komunikim të sigurt, të centralizuar. RiotX është një rishkrim i plotë i klientit Riot Android, bazuar në një rishkrim të plotë të Matrix Android SDK-së.
+    <string name="store_riotx_full_description">Element është një klient i ri për protokollin Matrix (Matrix.org): një rrjet i hapur për komunikim të sigurt, të centralizuar. Element është një rishkrim i plotë i klientit Riot Android, bazuar në një rishkrim të plotë të Matrix Android SDK-së.
 \n
-\nKlauzolë: Ky është një version beta. RiotX-i është ende nën zhivillim aktiv dhe përmban kufizime dhe (shpresojmë të mos jenë shumë) të meta. Mirëpresim krejt përshtypjet dhe sugjerimet!
+\nKlauzolë: Ky është një version beta. Element-i është ende nën zhivillim aktiv dhe përmban kufizime dhe (shpresojmë të mos jenë shumë) të meta. Mirëpresim krejt përshtypjet dhe sugjerimet!
 \n
-\nRiotX-i mbulon: • Hyrje në një llogari ekzistuese • Krijim dhome dhe pjesëmarrje në dhoma publike • Pranim dhe hedhje poshtë ftesash • Njohje të dhomave të përdoruesve • Parje hollësish dhome • Dërgim mesazhesh tekst • Dërgim bashkëngjitjesh • Lexim dhe shkrim mesazhesh në dhoma të fshehtëzuara • Kriptografi: kopjeruajtje kyçesh E2E, verifikim i thelluar pajisjesh, kërkesa dhe përgjigje për ndarje kyçesh • Njoftime push • Tema të Çelëta, të Errëta dhe të Zeza
+\nElement-i mbulon: • Hyrje në një llogari ekzistuese • Krijim dhome dhe pjesëmarrje në dhoma publike • Pranim dhe hedhje poshtë ftesash • Njohje të dhomave të përdoruesve • Parje hollësish dhome • Dërgim mesazhesh tekst • Dërgim bashkëngjitjesh • Lexim dhe shkrim mesazhesh në dhoma të fshehtëzuara • Kriptografi: kopjeruajtje kyçesh E2E, verifikim i thelluar pajisjesh, kërkesa dhe përgjigje për ndarje kyçesh • Njoftime push • Tema të Çelëta, të Errëta dhe të Zeza
 \n
-\nNë RiotX s’janë sendërtuar ende krejt veçoritë e Riot-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Thirrje • Widget-es • …</string>
+\nNë Element s’janë sendërtuar ende krejt veçoritë e Element-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Thirrje • Widget-es • …</string>
 
     <string name="settings_integration_manager">Përgjegjës Integrimesh</string>
 
@@ -1565,7 +1565,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="widget_integration_review_terms">Që të vazhdohet, lypset të pranoni Kushtet e këtij shërbimi.</string>
 
-    <string name="security_warning_identity_server">Versione të dikurshëm të Riot-it përmbanin një të metë sigurie, e cila mund t’i lejonte Shërbyesit tuaj të Identiteteve (%1$s) hyrje në llogarinë tuaj. Nëse i besoni %2$s, mund ta shpërfillni këtë sinjalizim; përndryshe dilni nga llogaria dhe ribëni hyrjen.
+    <string name="security_warning_identity_server">Versione të dikurshëm të Element-it përmbanin një të metë sigurie, e cila mund t’i lejonte Shërbyesit tuaj të Identiteteve (%1$s) hyrje në llogarinë tuaj. Nëse i besoni %2$s, mund ta shpërfillni këtë sinjalizim; përndryshe dilni nga llogaria dhe ribëni hyrjen.
 \n
 \nLexoni më tepër hollësi këtu:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1598,11 +1598,11 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="invite_no_identity_server_error">Që të kryhet ky veprim, shtoni një shërbyes identitetesh, që nga rregullimet tuaja.</string>
     <string name="settings_background_fdroid_sync_mode">Mënyrë Njëkohësimi Në Prapaskenë (Eksperimentale)</string>
     <string name="settings_background_fdroid_sync_mode_battery">E optimizuar për baterinë</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot-i do të bëjë njëkohësim në prapaskenë, në një mënyrë që kursen burimet e kufizuara të pajisjes (baterinë).
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element-i do të bëjë njëkohësim në prapaskenë, në një mënyrë që kursen burimet e kufizuara të pajisjes (baterinë).
 \nNë varësi të gjendjes së burimeve tuaja, njëkohësimi mund të shtyhet për më vonë nga sistemi operativ.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">I optimizuar për kohë të njëmendtë</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot0-i do të bëjë njëkohësim në prapaskenë periodikisht në një kohë të caktuar (e formësueshme).
-\nKjo do të ketë ndikim mbi përdorimin e baterisë dhe të transmetimit, do të shfaqet një njoftim i pandërprerë që pohon se Riot-i po përgjon për akte.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element0-i do të bëjë njëkohësim në prapaskenë periodikisht në një kohë të caktuar (e formësueshme).
+\nKjo do të ketë ndikim mbi përdorimin e baterisë dhe të transmetimit, do të shfaqet një njoftim i pandërprerë që pohon se Element-i po përgjon për akte.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Pa njëkohësim në prapraskenë</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">S’do të njoftoheni për mesazhe ardhës, kur aplikacioni gjendet në prapaskenë.</string>
     <string name="settings_background_sync_update_error">S’u arrit të përditësohen rregullime.</string>
@@ -1705,14 +1705,14 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 \n
 \nNëse s’doni të shihni më lëndë nga ky përdorues, mund ta bllokoni, që të fshihen mesazhet e tij</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot-i lyp leje për të ruajtur kyçet tuaj E2E në disk.
+    <string name="permissions_rationale_msg_keys_backup_export">Element-i lyp leje për të ruajtur kyçet tuaj E2E në disk.
 \n
 \nJu lutemi, lejoni, te flluska pasuese, hyrje për të qenë e mundur të eksportohen kyçet tuaj dorazi.</string>
 
     <string name="no_network_indicator">Tani për tani s’la lidhje rrjeti</string>
 
     <string name="settings_add_3pid_confirm_password_title">Ripohoni fjalëkalimin tuaj</string>
-    <string name="settings_add_3pid_flow_not_supported">Këtë s’e bëni dot që nga Riot-i për celular</string>
+    <string name="settings_add_3pid_flow_not_supported">Këtë s’e bëni dot që nga Element-i për celular</string>
     <string name="settings_add_3pid_authentication_needed">Lypset mirëfilltësim</string>
 
 
@@ -1787,18 +1787,18 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="login_continue">Vazhdo</string>
     <string name="login_connect_to">Lidhu me %1$s</string>
-    <string name="login_connect_to_modular">Lidhu me një shërbyes modular</string>
+    <string name="login_connect_to_modular">Lidhu me një shërbyes Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Lidhu me një shërbyes vetjak</string>
     <string name="login_signin_to">Hyni te %1$s</string>
     <string name="login_signup">Regjistrohuni</string>
     <string name="login_signin">Hyni</string>
     <string name="login_signin_sso">Vazhdoni me SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Adresë Modulari</string>
+    <string name="login_server_url_form_modular_hint">Adresë Element Matrix Services i</string>
     <string name="login_server_url_form_other_hint">Adresë</string>
     <string name="login_server_url_form_modular_text">Strehim me pagesë për ente</string>
-    <string name="login_server_url_form_modular_notice">Jepni adresën e Modular Riot-it ose Shërbyesit që doni të përdoret</string>
-    <string name="login_server_url_form_other_notice">Jepni adresën e një shërbyesi ose një instance Riot me të cilën doni të lidheni</string>
+    <string name="login_server_url_form_modular_notice">Jepni adresën e Modular Element-it ose Shërbyesit që doni të përdoret</string>
+    <string name="login_server_url_form_other_notice">Jepni adresën e një shërbyesi ose një instance Element me të cilën doni të lidheni</string>
 
     <string name="login_sso_error_message">Ndodhi një gabim kur ngarkohej faqja: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikacioni s’është në gjendje të bëjë hyrje në llogari në këtë shërbyes Home. Shërbyesi Home mbulon llojet vijuese të hyrjes(ve): %1$s.
@@ -1871,7 +1871,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 \nTë ndalet procesi i regjistrimit\?</string>
 
     <string name="login_a11y_choose_matrix_org">Përzgjidhni matrix.org</string>
-    <string name="login_a11y_choose_modular">Përzgjidhni modular</string>
+    <string name="login_a11y_choose_modular">Përzgjidhni Element Matrix Services</string>
     <string name="login_a11y_choose_other">Përzgjidhni një shërbyes Home vetjak</string>
     <string name="login_a11y_captcha_container">Ju lutemi, zgjidhni captcha-n</string>
     <string name="login_terms_title">Që të vazhdohet, pranoni terma</string>
@@ -1917,7 +1917,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 \nQë të mund të hyni te të dhëna të llogarisë tuaj dhe te mesazhe, bëni sërish hyrjen.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Do të humbni hyrje te mesazhe të sigurt, veç në hyfshi për të rimarrë kyçet tuaj të fshehtëzimit.</string>
     <string name="soft_logout_clear_data_dialog_submit">Spastro të dhënat</string>
-    <string name="soft_logout_sso_not_same_user_error">Sesioni i tanishëm është për përdoruesin %1$s dhe ju jepni kredenciale për përdoruesin %2$s. Kjo nuk mbulohet nga RiotX.
+    <string name="soft_logout_sso_not_same_user_error">Sesioni i tanishëm është për përdoruesin %1$s dhe ju jepni kredenciale për përdoruesin %2$s. Kjo nuk mbulohet nga Element.
 \nJu lutemi, së pari spastroni të dhëna, mandej hyni sërish në një tjetër llogari.</string>
 
     <string name="permalink_malformed">Lidhja juaj matrix.to është e keqformuar</string>
@@ -1942,7 +1942,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="autocomplete_limited_results">Po shfaqen vetëm përfundimet e para, shtypni më shumë shkronja…</string>
 
-    <string name="settings_developer_mode_fail_fast_summary">RiotX mund të vithiset më shpesh, kur ndodh një gabim i papritur</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element mund të vithiset më shpesh, kur ndodh një gabim i papritur</string>
     <string name="settings_call_ringtone_use_default_stun">Lejoni shërbyes rrugëzgjidhje asistimi thirrjesh</string>
     <string name="command_description_verify">Kërko të verifikohet userID-ja i dhënë</string>
     <string name="command_description_shrug">Parashtoji ¯\\_(ツ)_/¯ një mesazhi tekst të thjeshtë</string>
@@ -2094,9 +2094,9 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="verification_request_alert_description">Për siguri ekstra, verifikojeni %s duke parë kontrolluar në të dy pajisjet tuaja një kod njëpërdorimsh.
 \n
 \nPër sigurinë maksimale, bëjeni këtë ju vetë.</string>
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX nuk trajton akte të llojit \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX nuk trajton mesazhe të llojit \'%1$s\'</string>
-    <string name="rendering_event_error_exception">RiotX ndeshi një problem kur vizatohej lëndë e aktit me ID \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element nuk trajton akte të llojit \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element nuk trajton mesazhe të llojit \'%1$s\'</string>
+    <string name="rendering_event_error_exception">Element ndeshi një problem kur vizatohej lëndë e aktit me ID \'%1$s\'</string>
 
     <string name="verify_cannot_cross_sign">Ky sesion s’është në gjendje të ndajë këtë verifikim me sesionet tuaj të tjerë.
 \nVerifikimi do të ruhet lokalisht dhe do të ndahet nën një version të ardhshëm të aplikacionit.</string>
@@ -2165,7 +2165,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Kyçet janë tashmë të përditësuar!</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Kërkesa Kyçi</string>
 
@@ -2304,13 +2304,13 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="error_adding_media_file_to_gallery">S’u shtua dot kartelë media te Galeria</string>
     <string name="change_password_summary">Caktoni një fjalëkalim të ri llogarie…</string>
 
-    <string name="use_other_session_content_description">Përdorni Riot-in më të ri në pajisjet tuaja të tjera, Riot Web, Riot Desktop, Riot iOS, RiotX për Android, ose ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
-    <string name="riot_desktop_web">Riot Web
-\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X për Android</string>
+    <string name="use_other_session_content_description">Përdorni Element-in më të ri në pajisjet tuaja të tjera, Element Web, Element Desktop, Element iOS, Element për Android, ose ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
+    <string name="riot_desktop_web">Element Web
+\nElement Desktop</string>
+    <string name="riot_ios_android">Element iOS
+\nElement për Android</string>
     <string name="or_other_mx_capabale_client">ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
-    <string name="use_latest_riot">Përdorni Riot-in më të ri në pajisjet tuaja të tjera:</string>
+    <string name="use_latest_riot">Përdorni Element-in më të ri në pajisjet tuaja të tjera:</string>
     <string name="command_description_discard_session_not_handled">Mbulohet vetëm për dhoma të fshehtëzuara</string>
     <string name="enter_secret_storage_passphrase_or_key">Përdorni %1$s tuaj ose përdorni %2$s tuaj që të vazhdohet.</string>
     <string name="use_recovery_key">Përdorni Kyçin Rimarrjesh</string>
@@ -2381,7 +2381,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="choose_locale_loading_locales">Po ngarkohen gjuhë të gatshme…</string>
 
     <string name="disconnect_identity_server_dialog_content">Të bëhet shkëputja prej shërbyesit tuaj të identitetit %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Ky shërbyes identitetesh është i vjetruar. RiotX mbulon vetëm API V2.</string>
+    <string name="identity_server_error_outdated_identity_server">Ky shërbyes identitetesh është i vjetruar. Element mbulon vetëm API V2.</string>
     <string name="identity_server_error_outdated_home_server">Ky veprim s’është i mundshëm. Shërbyesi Home është i vjetruar.</string>
     <string name="identity_server_error_no_identity_server_configured">Ju lutemi, së pari formësoni një shërbyes identitetesh.</string>
     <string name="identity_server_error_terms_not_signed">Ju lutemi, së pari pranoni te rregullimet termat e shërbyesit të identiteteve.</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 46e2149672..481e667789 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -133,7 +133,7 @@
     <string name="user_directory_header">Användarkatalog</string>
     <string name="matrix_only_filter">Bara Matrix-kontakter</string>
     <string name="no_conversation_placeholder">Inga konversationer</string>
-    <string name="no_contact_access_placeholder">Du gav inte Riot tillgång till dina lokala kontakter</string>
+    <string name="no_contact_access_placeholder">Du gav inte Element tillgång till dina lokala kontakter</string>
     <string name="no_result_placeholder">Inga resultat</string>
     <string name="people_no_identity_server">Ingen identitetsserver konfigurerad.</string>
 
@@ -291,7 +291,7 @@
     <string name="e2e_re_request_encryption_key_sent">Nyckelförfrågan har skickats.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Förfrågan har skickats</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Vänligen öppna Riot på en annan enhet som kan dekryptera meddelandet så att den kan skicka nycklarna till den här sessionen.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Vänligen öppna Element på en annan enhet som kan dekryptera meddelandet så att den kan skicka nycklarna till den här sessionen.</string>
 
     <string name="read_receipts_list">Läskvittolista</string>
 
@@ -320,7 +320,7 @@
     <string name="room_info_room_topic">Rumsämne</string>
 
     <string name="settings_call_category">Samtal</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Använd förvald Riot-ringsignal för inkommande samtal</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Använd förvald Element-ringsignal för inkommande samtal</string>
     <string name="settings_call_ringtone_use_default_stun">Tillåt reservassistansserver för samtal</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Kommer att använda %s som reserv när din hemserver inte erbjuder en (din IP-adress kommer att delas under samtalet)</string>
     <string name="settings_call_ringtone_title">Ringsignal för inkommande samtal</string>
@@ -346,22 +346,22 @@
     <string name="media_picker_cannot_record_video">Kan inte spela in video</string>
 
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Riot behöver tillstånd att komma åt ditt foto- och videobibliotek för att skicka och spara bilagor.
+    <string name="permissions_rationale_msg_storage">Element behöver tillstånd att komma åt ditt foto- och videobibliotek för att skicka och spara bilagor.
 \n
 \nVänligen tillåt åtkomst i nästa pop-up för att kunna skicka filer från din telefon.</string>
-    <string name="permissions_rationale_msg_camera">Riot behöver tillstånd att komma åt din kamera för att kunna ta bilder och hålla videosamtal.</string>
+    <string name="permissions_rationale_msg_camera">Element behöver tillstånd att komma åt din kamera för att kunna ta bilder och hålla videosamtal.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVänligen ge tillgång i nästa pop-up för att kunna utföra samtalet."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot behöver tillstånd att komma åt din mikrofon för hålla röstsamtal.</string>
+    <string name="permissions_rationale_msg_record_audio">Element behöver tillstånd att komma åt din mikrofon för hålla röstsamtal.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nVänligen ge tillgång i nästa pop-up för att kunna utföra samtalet."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot behöver tillstånd att komma åt din kamera och mikrofon för att kunna utföra videosamtal.
+    <string name="permissions_rationale_msg_camera_and_audio">Element behöver tillstånd att komma åt din kamera och mikrofon för att kunna utföra videosamtal.
 \n
 \nVänligen ge tillgång i nästa pop-up för att kunna utföra samtalet.</string>
-    <string name="permissions_rationale_msg_contacts">Riot kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer. Om du går med på att dela din adressbok för detta ändamål, vänligen ge tillgång i nästa pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer.
+    <string name="permissions_rationale_msg_contacts">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer. Om du går med på att dela din adressbok för detta ändamål, vänligen ge tillgång i nästa pop-up.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer.
 \n
 \nVill du dela din adressbok för detta ändamål\?</string>
 
@@ -507,13 +507,13 @@
     <string name="send_suggestion_sent">Tack, ditt förslag har skickats framgångsrikt</string>
     <string name="send_suggestion_failed">Förslaget misslyckades att skickas (%s)</string>
 
-    <string name="store_riotx_full_description">RiotX är en ny klient för Matrix-protokollet (Matrix.org): ett öppet nätverk för säker, decentraliserad kommunikation. RiotX är en komplett omskrivning av klienten Riot för Android, baserat på en komplett omskrivning av Matrix-SDK:t för Android.
+    <string name="store_riotx_full_description">Element är en ny klient för Matrix-protokollet (Matrix.org): ett öppet nätverk för säker, decentraliserad kommunikation. Element är en komplett omskrivning av klienten Riot för Android, baserat på en komplett omskrivning av Matrix-SDK:t för Android.
 \n
-\nVarning: Detta är en betaversion. RiotX är för närvarande under aktiv utveckling och innehåller begränsningar och (vi hoppas inte alltför många) buggar. All feedback är välkommen!
+\nVarning: Detta är en betaversion. Element är för närvarande under aktiv utveckling och innehåller begränsningar och (vi hoppas inte alltför många) buggar. All feedback är välkommen!
 \n
-\nRiotX stöder: • Logga in med ett existerande konto • Skapa rum och gå med i publika rum • Acceptera och neka inbjudningar • Lista användares rum • Visa rumsdetaljer • Skicka textmeddelanden • Skicka bilagor • Läsa och skriva meddelanden i krypterade rum • Krypto: säkerhetskopiering av E2E-nycklar, avancerad enhetsverifiering, nyckeldelningsförfrågan och -svar • Pushnotiser • Ljust, mörkt eller svart tema
+\nElement stöder: • Logga in med ett existerande konto • Skapa rum och gå med i publika rum • Acceptera och neka inbjudningar • Lista användares rum • Visa rumsdetaljer • Skicka textmeddelanden • Skicka bilagor • Läsa och skriva meddelanden i krypterade rum • Krypto: säkerhetskopiering av E2E-nycklar, avancerad enhetsverifiering, nyckeldelningsförfrågan och -svar • Pushnotiser • Ljust, mörkt eller svart tema
 \n
-\nInte alla funktioner i Riot är implementerade i RiotX än. Huvudsakligen saknade (vilka kommer snart!) funktioner: • Rumsinställningar (lista rumsmedlemmar, o.s.v.) • Röstsamtal • Widgets • …</string>
+\nInte alla funktioner i Element är implementerade i Element än. Huvudsakligen saknade (vilka kommer snart!) funktioner: • Rumsinställningar (lista rumsmedlemmar, o.s.v.) • Röstsamtal • Widgets • …</string>
 
     <string name="bottom_action_people_x">Direktmeddelanden</string>
 
@@ -578,7 +578,7 @@
 
     <string name="settings_general_title">Allmänt</string>
     <string name="settings_preferences">Alternativ</string>
-    <string name="store_riotx_title">RiotX - Nästa generations Matrix-klient</string>
+    <string name="store_riotx_title">Element - Nästa generations Matrix-klient</string>
     <string name="store_riotx_short_description">En snabbare och lättviktigare klient för Matrix som använder de senaste Android-ramverken</string>
     <string name="room_directory_search_hint">Namn eller ID (#example:matrix.org)</string>
 
@@ -634,7 +634,7 @@
 \nVänligen kolla kontoinställningarna.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Aviseringar är aktiverade för den här sessionen.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Aviseringar är inaktiverade för den här sessionen.
-\nVänligen kolla Riotinställningarna.</string>
+\nVänligen kolla Elementinställningarna.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Observera att vissa meddelandetyper är satta till tyst (kommer att producera aviseringar utan ljud).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Vissa aviseringar är inaktiverade i dina anpassade inställningar.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">Aviseringstjänst</string>
@@ -642,8 +642,8 @@
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Aviseringstjänsten körs inte.
 \nFörsök att starta om appen.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Automatisk omstart av aviseringstjänsten</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Tjänsten kommer inte att starta när enheten startas om, så du kommer inte att få aviseringar förrens Riot har öppnats en gång.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Bakgrundsbegränsningar är aktiverade för Riot.
+    <string name="settings_troubleshoot_test_service_boot_failed">Tjänsten kommer inte att starta när enheten startas om, så du kommer inte att få aviseringar förrens Element har öppnats en gång.</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Bakgrundsbegränsningar är aktiverade för Element.
 \nSaker som appen försöker göra kommer att kraftigt begränsas när appen är bakgrunden, och detta kan påverka aviseringar.
 \n
 \n%1$s</string>
@@ -666,8 +666,8 @@
     <string name="settings_containing_my_user_name">Meddelanden innehållande mitt användarnamn</string>
     <string name="settings_messages_in_one_to_one">Meddelanden i direktchattar</string>
     <string name="settings_messages_in_group_chat">Meddelanden i gruppchattar</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot kommer att synka I bakgrunden periodiskt vid precisa tider (konfigurerbart).
-\nDetta kommer att påverka data- och batterianvändning, och det kommer att visas en permanent avisering som säger att Riot lyssnar efter händelser.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element kommer att synka I bakgrunden periodiskt vid precisa tider (konfigurerbart).
+\nDetta kommer att påverka data- och batterianvändning, och det kommer att visas en permanent avisering som säger att Element lyssnar efter händelser.</string>
     <string name="settings_version">Version</string>
     <string name="settings_olm_version">olm-version</string>
     <string name="settings_keep_media">Behåll media</string>
@@ -688,9 +688,9 @@
     <string name="settings_discovery_category">Upptäckbarhet</string>
     <string name="settings_discovery_manage">Hantera dina upptäckbarhetsinställningar.</string>
     <string name="startup_notification_privacy_title">Aviseringssekretess</string>
-    <string name="startup_notification_privacy_message">Riot kan köra i bakgrunden för att hantera dina aviseringar säkert och privat. Detta kan påverka batteritiden.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot behöver hålla en bakgrundsanslutning med låg påverkan för att ha pålitliga aviseringar.
-\nPå nästa skärm kommer du att frågas om du vill tillåta att Riot alltid körs i bakgrunden, vänligen acceptera.</string>
+    <string name="startup_notification_privacy_message">Element kan köra i bakgrunden för att hantera dina aviseringar säkert och privat. Detta kan påverka batteritiden.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element behöver hålla en bakgrundsanslutning med låg påverkan för att ha pålitliga aviseringar.
+\nPå nästa skärm kommer du att frågas om du vill tillåta att Element alltid körs i bakgrunden, vänligen acceptera.</string>
     <string name="settings_logged_in">Inloggad som</string>
     <string name="settings_home_server">Hemserver</string>
     <string name="settings_identity_server">Identitetsserver</string>
@@ -724,7 +724,7 @@
     <string name="device_name_warning">En sessions publika namn är synligt för personer du pratar med</string>
     <string name="encryption_message_recovery">Återställning av krypterade meddelanden</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Skicka aldrig krypterade meddelanden till overifierade sessioner från den här sessionen.</string>
-    <string name="e2e_enabling_on_app_update">Riot stöder nu totalsträckskryptering men du behöver logga in igen för att aktivera det.
+    <string name="e2e_enabling_on_app_update">Element stöder nu totalsträckskryptering men du behöver logga in igen för att aktivera det.
 \n
 \nDu kan göra det nu eller senare från appinställningarna.</string>
 
@@ -768,7 +768,7 @@
     <string name="sas_incoming_request_description">Verifiera den här sessionen för att markera den som pålitligt. Att lita på folks sessioner ger dig extra sinnesro när du skickar totalsträckskrypterade meddelanden.</string>
     <string name="sas_verified_successful_description">Säkra meddelanden mellan dig och den här användaren är totalsträckskrypterade och kommer inte att vara läsbara för tredje parter.</string>
     <string name="identity_server_not_defined">Du använder ingen identitetsserver</string>
-    <string name="security_warning_identity_server">Tidigare versioner av Riot hade en säkerhetsbugg som kunde ge din identitetsserver (%1$s) tillgång till ditt konto. Om du litar på %2$s så kan du ignorera detta; annars bör du logga ut och logga in igen.
+    <string name="security_warning_identity_server">Tidigare versioner av Element hade en säkerhetsbugg som kunde ge din identitetsserver (%1$s) tillgång till ditt konto. Om du litar på %2$s så kan du ignorera detta; annars bör du logga ut och logga in igen.
 \n
 \nLäs mer detaljer här:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -866,7 +866,7 @@
     <string name="settings_advanced_settings">Avancerade inställningar</string>
     <string name="autocomplete_limited_results">Visar endast de första resultaten, skriv mer…</string>
 
-    <string name="settings_developer_mode_fail_fast_summary">RiotX kan krascha mer när ett oväntat fel inträffar</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element kan krascha mer när ett oväntat fel inträffar</string>
 
     <string name="create_room_encryption_description">Efter aktivering så kan kryptering inte avaktiveras.</string>
 
@@ -929,7 +929,7 @@
     <string name="invite_users_to_room_failure">Vi kunde inte bjuda in användarna. Vänligen kolla användarna du vill bjuda in och försök igen.</string>
 
     <string name="disconnect_identity_server_dialog_content">Koppla bort från identitetsservern %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Den här identitetsservern är utdaterat. RiotX stöder endast API V2.</string>
+    <string name="identity_server_error_outdated_identity_server">Den här identitetsservern är utdaterat. Element stöder endast API V2.</string>
     <string name="identity_server_error_no_identity_server_configured">Vänligen konfigurera en identitetsserver.</string>
     <string name="identity_server_error_terms_not_signed">Vänligen acceptera först identitetsserverns användarvillkor i inställningarna.</string>
     <string name="identity_server_set_default_notice">Din hemserver (%1$s) föreslår att du använder %2$s som din identitetsserver</string>
diff --git a/vector/src/main/res/values-te/strings.xml b/vector/src/main/res/values-te/strings.xml
index df79f70824..9d24f73512 100644
--- a/vector/src/main/res/values-te/strings.xml
+++ b/vector/src/main/res/values-te/strings.xml
@@ -181,8 +181,8 @@
     <string name="media_picker_cannot_record_video">వీడియో రికార్డ్ చేయలేరు</string>
 
     <string name="permissions_rationale_popup_title">సమాచారం</string>
-    <string name="permissions_rationale_msg_camera">చిత్రాలను మరియు వీడియో కాల్లను తీయడానికి మీ కెమెరాను ప్రాప్తి చేయడానికి Riotకు అనుమతి అవసరం.</string>
-    <string name="permissions_rationale_msg_record_audio">ఆడియో కాల్లను చేయడానికి మీ మైక్రోఫోన్ను ప్రాప్యత చేయడానికి Riotకు అనుమతి అవసరం.</string>
+    <string name="permissions_rationale_msg_camera">చిత్రాలను మరియు వీడియో కాల్లను తీయడానికి మీ కెమెరాను ప్రాప్తి చేయడానికి Elementకు అనుమతి అవసరం.</string>
+    <string name="permissions_rationale_msg_record_audio">ఆడియో కాల్లను చేయడానికి మీ మైక్రోఫోన్ను ప్రాప్యత చేయడానికి Elementకు అనుమతి అవసరం.</string>
     <string name="permissions_action_not_performed_missing_permissions">క్షమించాలి… ఆమోదించని అనుమతుల కారణంగా చర్య చేయలేదు</string>
 
     <string name="media_slider_saved">దాయబడినది</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 772b3701cd..d1edb559ea 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -102,7 +102,7 @@
     <string name="user_directory_header">Kullanıcı sözlüğü</string>
     <string name="matrix_only_filter">Sadece Matrix kullanıcıları</string>
     <string name="no_conversation_placeholder">Konuşma yok</string>
-    <string name="no_contact_access_placeholder">Riot\'un yerel rehbere erişmesine izin vermediniz</string>
+    <string name="no_contact_access_placeholder">Element\'in yerel rehbere erişmesine izin vermediniz</string>
     <string name="no_result_placeholder">Sonuç yok</string>
 
     <string name="rooms_header">Odalar</string>
@@ -297,7 +297,7 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="e2e_re_request_encryption_key_sent">Anahtar isteği gönderildi.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">İstek gönderildi</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Riot\'u mesajları çözebilen farklı bir cihazda açarsanız ordan anahtarları bu oturuma gönderebilirsiniz.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Element\'i mesajları çözebilen farklı bir cihazda açarsanız ordan anahtarları bu oturuma gönderebilirsiniz.</string>
 
     <string name="read_receipts_list">Makbuz Listesini Oku</string>
 
@@ -326,7 +326,7 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="room_info_room_topic">Oda konusu</string>
 
     <string name="settings_call_category">Aramalar</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Gelen aramalar için varsayılan Riot zil sesini kullan</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Gelen aramalar için varsayılan Element zil sesini kullan</string>
     <string name="settings_call_ringtone_title">Gelen arama zil sesi</string>
     <string name="settings_call_ringtone_dialog_title">Aramalar için zil sesi seç:</string>
 
@@ -350,22 +350,22 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="media_picker_cannot_record_video">Video kaydedilemiyor</string>
 
     <string name="permissions_rationale_popup_title">Bilgilendirme</string>
-    <string name="permissions_rationale_msg_storage">Riot\'un ekleri göndermek ya da kaydetmek için galeriye erişmeye ihtiyacı var.
+    <string name="permissions_rationale_msg_storage">Element\'in ekleri göndermek ya da kaydetmek için galeriye erişmeye ihtiyacı var.
 \n
 \nLütfen çıkacak ekranda telefonunuzdan dosya gönderebilmesine izin verin.</string>
-    <string name="permissions_rationale_msg_camera">Riot\'un resim ya da video çekmek için kameraya erişmeye ihtiyacı var.</string>
+    <string name="permissions_rationale_msg_camera">Element\'in resim ya da video çekmek için kameraya erişmeye ihtiyacı var.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nLütfen çıkacak ekranda kameraya erişebilmesine izin verin."</string>
-    <string name="permissions_rationale_msg_record_audio">Riot\'un sesli arama yapması için mikrofonunuza erişmeye ihtiyacı var.</string>
+    <string name="permissions_rationale_msg_record_audio">Element\'in sesli arama yapması için mikrofonunuza erişmeye ihtiyacı var.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nLütfen çıkacak ekranda mikrofona erişebilmesine izin verin."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot\'un görüntülü arama yapması için kameranıza ve mikrofonunuza erişmeye ihtiyacı var.
+    <string name="permissions_rationale_msg_camera_and_audio">Element\'in görüntülü arama yapması için kameranıza ve mikrofonunuza erişmeye ihtiyacı var.
 \n
 \nLütfen çıkacak ekranda kamera ve mikrofona erişebilmesine izin verin.</string>
-    <string name="permissions_rationale_msg_contacts">Riot eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir. Eğer bu nedenle rehberinizi paylaşmak istiyorsanız, lütfen açılan ekranda erişime izin verin.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot\'un eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir. 
+    <string name="permissions_rationale_msg_contacts">Element eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir. Eğer bu nedenle rehberinizi paylaşmak istiyorsanız, lütfen açılan ekranda erişime izin verin.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element\'in eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir.
 \n 
 \nRehberinizi bu sebeple paylaşmayı kabul ediyor musunuz\?</string>
 
@@ -613,7 +613,7 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="settings_troubleshoot_test_device_settings_title">Oturum Ayarları.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Bildirimler bu oturum için etkinleştirilmiş.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Bildirimler bu oturum için etkin değil. 
-\nLütfen Riot ayarlarını gözden geçirin.</string>
+\nLütfen Element ayarlarını gözden geçirin.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Etkinleştir</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Özel Ayarlar.</string>
@@ -624,7 +624,7 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
 
     <string name="settings_troubleshoot_test_play_services_title">Play Hizmetlerini Gözden Geçir</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Hizmetleri APK\'sı kullanılabilir ve güncel.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot bildirimleri göndermek için Google Play Hizmetleri kullanır, ancak düzgün ayarlanmış görünmüyor:
+    <string name="settings_troubleshoot_test_play_services_failed">Element bildirimleri göndermek için Google Play Hizmetleri kullanır, ancak düzgün ayarlanmış görünmüyor:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Google Play Hizmetlerini Düzelt</string>
 
@@ -634,11 +634,11 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="settings_troubleshoot_test_fcm_failed">FCM belirtecini alırken hata meydana geldi:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nBu hata Riot\'un kontrolü dışında Google\'a bağlı ve cihazın çok fazla FCM ile kayıtlı uygulaması olduğunu belirtiyor. Bu hata sadece çok fazla uygulama kullanıldığı zaman olur ve genelde ortalama kullanıcıyı etkilemez.</string>
+\nBu hata Element\'in kontrolü dışında Google\'a bağlı ve cihazın çok fazla FCM ile kayıtlı uygulaması olduğunu belirtiyor. Bu hata sadece çok fazla uygulama kullanıldığı zaman olur ve genelde ortalama kullanıcıyı etkilemez.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nBu hata Riot\'un kontrolü dışında ve birçok nedene bağlı olabilir. Belki sonra denediğin zaman çalışır. Ayrıca Google Play Hizmetlerinin veri kullanımı konusunda sistem ayarlarında kısıtlanmamış ya da cihaz saatinin doğru olduğundan emin olun, bu hata özel ROM\'larda meydana gelebiliyor.</string>
+\nBu hata Element\'in kontrolü dışında ve birçok nedene bağlı olabilir. Belki sonra denediğin zaman çalışır. Ayrıca Google Play Hizmetlerinin veri kullanımı konusunda sistem ayarlarında kısıtlanmamış ya da cihaz saatinin doğru olduğundan emin olun, bu hata özel ROM\'larda meydana gelebiliyor.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nBu hata Riot\'un kontrolü dışında. Telefonda hiç Google hesabı yok. Lütfen hesap yöneticisini açın ve bir tane Google hesabı ekleyin.</string>
+\nBu hata Element\'in kontrolü dışında. Telefonda hiç Google hesabı yok. Lütfen hesap yöneticisini açın ve bir tane Google hesabı ekleyin.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Hesap ekle</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Belirteç Kayıtı</string>
@@ -658,19 +658,19 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
 
     <string name="settings_troubleshoot_test_service_boot_title">Açılışta başlat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Hizmet cihaz yeniden başlatıldığında çalıştırılacak.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Hizmet cihaz yeniden başlatılınca çalıştırılmayacak, Riot\'u açana kadar bildirimleri almakyacaksın.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Hizmet cihaz yeniden başlatılınca çalıştırılmayacak, Element\'i açana kadar bildirimleri almakyacaksın.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Açılışta başlatı etkinleştir</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Arkaplan kısıtlamalarını gözden geçir</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Arkaplan kısıtlamaları Riot için devre dışı. Bu test mobil veri kullanacak (WIFI değil).
+    <string name="settings_troubleshoot_test_bg_restricted_success">Arkaplan kısıtlamaları Element için devre dışı. Bu test mobil veri kullanacak (WIFI değil).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Arkaplan kısıtlamaları Riot için etkinleştirilmiş.
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Arkaplan kısıtlamaları Element için etkinleştirilmiş.
 \nUygulamanın arkaplanda iken yapmaya çalıştığı şeyler agresif bir biçimde kısıtlanacak ve bu bildirimleri de etkileyebilir.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Kısıtlamaları devre dışı bırak</string>
 
     <string name="settings_troubleshoot_test_battery_title">Pil Optimizasyonu</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot Pil Optimizasyonundan etkilenmedi.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element Pil Optimizasyonundan etkilenmedi.</string>
     <string name="settings_troubleshoot_test_battery_failed">Eğer kullanıcı cihazını prize bağlanmamış sabit ve ekranı kapalı bir şekilde bir süre bırakırsa cihaz Derin uyku moduna geçer. Bu uygulamaların internete erişmesini engeller ve yapılacak işlerini, senkronizasyolarını, alarmını erteler.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimizasyonu Göz ardı et</string>
 
@@ -755,19 +755,19 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="settings_deactivate_my_account">Hesabımı devre dışı bırak</string>
 
     <string name="startup_notification_privacy_title">Bildirim Gizliliği</string>
-    <string name="startup_notification_privacy_message">Riot bildirimlerinizi güvenli ve gizli bir şekilde yönetmek için arkaplanda çalışır. Bu pil kullanımını etkileyebilir.</string>
+    <string name="startup_notification_privacy_message">Element bildirimlerinizi güvenli ve gizli bir şekilde yönetmek için arkaplanda çalışır. Bu pil kullanımını etkileyebilir.</string>
     <string name="startup_notification_privacy_button_grant">İzin ver</string>
     <string name="startup_notification_privacy_button_other">Farklı bir seçenek seç</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Arkaplan Bağlantısı</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot güvenilir bildirimlere sahip olmak için düşük arkaplan bağlatısı yapmaya ihtiyaç duyar.
-\nÇıkacak ekranda Riot\'un arkaplanda sürekli çalışması için izin istenecek, lütfen kabul edin.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element güvenilir bildirimlere sahip olmak için düşük arkaplan bağlatısı yapmaya ihtiyaç duyar.
+\nÇıkacak ekranda Element\'in arkaplanda sürekli çalışması için izin istenecek, lütfen kabul edin.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">İzin ver</string>
 
     <string name="settings_analytics">Analiz</string>
     <string name="settings_opt_in_of_analytics">Analiz verilerini gönder</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot uygulamayı geliştirmemiz için anonim analitik veriler toplar.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Lütfen Riot\'u geliştirebilmemiz için analizleri etkinleştirin.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element uygulamayı geliştirmemiz için anonim analitik veriler toplar.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Lütfen Element\'i geliştirebilmemiz için analizleri etkinleştirin.</string>
     <string name="settings_opt_in_of_analytics_ok">Evet, Yardım etmek istiyorum!</string>
 
     <string name="settings_data_save_mode">Veri kaydetme modu</string>
@@ -963,7 +963,7 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="encryption_information_verify_device_warning2">Eğer uyuşursa aşağıdaki doğrulama tuşuna basın. Eğer uyuşmaz ise biri bu oturum engelliyor demektir bu durumda sen o kişi karalisteye eklemelisin. Gelecekte doğrulama işlemi daha gelişmiş olacak.</string>
     <string name="encryption_information_verify_key_match">Anahtarın uyuştuğunu doğruluyorum</string>
 
-    <string name="e2e_enabling_on_app_update">Riot artık uçtan-uca şifrelemeyi destekliyor ancak etkinleştirmen için tekrar giriş yapman gerekli. 
+    <string name="e2e_enabling_on_app_update">Element artık uçtan-uca şifrelemeyi destekliyor ancak etkinleştirmen için tekrar giriş yapman gerekli.
 \n 
 \nBunu şimdi ya da sonra uygulama ayarlarından yapabilirsin.</string>
 
@@ -1162,20 +1162,20 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Geçerli Google Play Hizmetleri APK\'sı bulunamadı. Bildirimler olması gerektiği gibi çalışmayacak.</string>
 
-    <string name="store_title">Riot.im - İletişim, senin yolunda</string>
-    <string name="store_whats_new">"Biz her zaman Riot.im’e geliştirmeler ve değişimler yapıyoruz.
+    <string name="store_title">Element - İletişim, senin yolunda</string>
+    <string name="store_whats_new">"Biz her zaman Element’e geliştirmeler ve değişimler yapıyoruz.
 Tam değişiklikler listesi burada bulunabilir: %1$s.
 Bir şeyleri kaçırmamak için güncellemeleri açık tutun."</string>
     <string name="store_short_description">Evrensel senin kontrolün altında güvenli sohbet uygulaması.</string>
-    <string name="store_full_description">"Bir sohbet uygulaması, senin kontrolün altında ve tamamen esnek. Riot senin istediğin şekilde iletişim kurmanı sağlar. [matrix] için yapıldı - açık, merkezi olmayan iletişim için bir standart.
+    <string name="store_full_description">"Bir sohbet uygulaması, senin kontrolün altında ve tamamen esnek. Element senin istediğin şekilde iletişim kurmanı sağlar. [matrix] için yapıldı - açık, merkezi olmayan iletişim için bir standart.
 
 Ücretsiz matrix.org hesabı al, https://modular.im adresinde kendi özel sunucunu al ya da farklı bir Matrix sunucusu kullan.
 
-Neden Riot.im’i seçmeliyim?
+Neden Element’i seçmeliyim?
 
 • TAMAMEN İLETİŞİM: Takımın, arkadaşların ve topluluğun etrafında odalar oluştur - nasıl istersen! Sohbet et, dosya paylaş, widget ekle ve sesli arama yap ya da görüntülü arama yap - tamamen ücretsiz.
 
-• GÜÇLÜ ENTEGRASYON: Riot.im’i bildiğin ve sevdiğin araçlarla kullan. Riot.im ile farklı sohbet uygulamalarındaki kullanıcılar, gruplarla bile konuşabilirsin.
+• GÜÇLÜ ENTEGRASYON: Element’i bildiğin ve sevdiğin araçlarla kullan. Element ile farklı sohbet uygulamalarındaki kullanıcılar, gruplarla bile konuşabilirsin.
 
 • GİZLİ VE GÜVENLİ: Tartışmalarını gizli tutar. Uçtan-uca şifreleme gizli iletişimin gizli kalmasını sağlar.
 
@@ -1190,7 +1190,7 @@ Neden Riot.im’i seçmeliyim?
     <string name="passphrase_empty_error_message">Lütfen bir parola girin</string>
     <string name="passphrase_passphrase_too_weak">Parola çok zayıf</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Eğer Riot.im\'in kurtarma anahtarı oluşturmasını istiyorsanız lütfen parolayı silin.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Eğer Element\'in kurtarma anahtarı oluşturmasını istiyorsanız lütfen parolayı silin.</string>
     <string name="keys_backup_no_session_error">Matrix oturumu müsait değil</string>
 
     <string name="keys_backup_setup_step1_title">Şifrelenmiş mesajları asla kaybetme</string>
@@ -1333,11 +1333,11 @@ Neden Riot.im’i seçmeliyim?
     <string name="settings_call_ringtone_use_default_stun_sum">Anasunucunuz çağrı yardımcı sunucusu vermez ise %s çağrı yardımcı sunucusu olarak kullanılacaktır (Çağrıda IP adresiniz paylaşılacaktır)</string>
     <string name="invite_no_identity_server_error">Bu eylemi gerçekleştirebilmek için ayarlarınızdan bir kimlik sunucusu ekleyin.</string>
     <string name="settings_add_3pid_confirm_password_title">Şifreni doğrula</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot, cihazın sınırlı kaynaklarını (pil) koruyacak şekilde arka planda senkronize olur.
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element, cihazın sınırlı kaynaklarını (pil) koruyacak şekilde arka planda senkronize olur.
 \nCihazınızın kaynak durumuna bağlı olarak, senkronizasyon işletim sistemi tarafından ertelenebilir.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Gerçek zamanlı için optimize</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot periyodik olarak belirli bir zamanda (ayarlanabilir) arka planda senkronize olur.
-\nBu pil ve radyo kullanımını etkileyecek ve riotun olayları dinlediğini belirten kalıcı bir bildirim gösterecektir.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element periyodik olarak belirli bir zamanda (ayarlanabilir) arka planda senkronize olur.
+\nBu pil ve radyo kullanımını etkileyecek ve Element\'in olayları dinlediğini belirten kalıcı bir bildirim gösterecektir.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Arka plan senkronizasyonu yok</string>
     <string name="settings_set_workmanager_delay">Tercih Edilen Senkronize Aralığı</string>
     <string name="settings_set_workmanager_delay_summary">%s
@@ -1431,7 +1431,7 @@ Neden Riot.im’i seçmeliyim?
     <string name="keys_backup_settings_checking_backup_state">Yedek durumu kontrol ediliyor</string>
     <string name="autodiscover_invalid_response">Geçersiz anasunucu keşif cevabı</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Sunucu Ayarlarını Otomatik Doldur</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot userld alan adı için özel sunucu yapılandırması buldu \"%1$s\":
+    <string name="autodiscover_well_known_autofill_dialog_message">Element userld alan adı için özel sunucu yapılandırması buldu \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Yapılandırmayı kullan</string>
 
@@ -1485,7 +1485,7 @@ Neden Riot.im’i seçmeliyim?
     <string name="identity_server_not_defined">Herhangi bir kimlik sunucusu kullanmıyorsunuz</string>
     <string name="identity_server_not_defined_for_password_reset">Hiçbir kimlik sunucusu yapılandırılmamış, bu şifrenizi değiştirebilmeniz için gerekli.</string>
 
-    <string name="security_warning_identity_server">Riot\'un önceki sürümlerinde, kimlik sunucunuzun (%1$s) hesabınıza erişebilmesini sağlayan bir güvenlik hatası vardı. %2$s sunucusuna güveniyorsanız, bunu göz ardı edebilirsiniz; aksi takdirde lütfen çıkış yapın ve tekrar giriş yapın.
+    <string name="security_warning_identity_server">Element\'in önceki sürümlerinde, kimlik sunucunuzun (%1$s) hesabınıza erişebilmesini sağlayan bir güvenlik hatası vardı. %2$s sunucusuna güveniyorsanız, bunu göz ardı edebilirsiniz; aksi takdirde lütfen çıkış yapın ve tekrar giriş yapın.
 \n
 \nDaha fazla ayrıntıya buradan bakabilirsiniz:
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1530,7 +1530,7 @@ Neden Riot.im’i seçmeliyim?
     <string name="group_all_communities">Tüm Topluluklar</string>
 
     <string name="room_preview_no_preview">Bu oda önizlenemez</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">RiotX henüz herkese-açık odaları önizlemeyi desteklemiyor</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Element henüz herkese-açık odaları önizlemeyi desteklemiyor</string>
 
     <string name="fab_menu_create_room">Odalar</string>
     <string name="fab_menu_create_chat">Doğrudan Mesajlar</string>
@@ -1547,10 +1547,10 @@ Neden Riot.im’i seçmeliyim?
     <string name="keys_backup_unable_to_get_keys_backup_data">Anahtar yedek verileri alınırken hata oluştu</string>
 
     <string name="alpha_disclaimer_title">Betaya hoşgeldiniz!</string>
-    <string name="alpha_disclaimer_content_line_1">RiotX geliştirme sürecindeyken bazı özellikler eksik olabilir ve hatalar ile karşılaşabilirsiniz.</string>
+    <string name="alpha_disclaimer_content_line_1">Element geliştirme sürecindeyken bazı özellikler eksik olabilir ve hatalar ile karşılaşabilirsiniz.</string>
     <string name="login_error_no_homeserver_found">Bu geçerli bir Matrix sunucu adresi değil</string>
     <string name="login_error_homeserver_not_found">Bu URL ile ev-sunucusuna erişilemiyor, lütfen kontrol edin</string>
-    <string name="settings_add_3pid_flow_not_supported">Bunu Riot mobil ile yapamazsınız</string>
+    <string name="settings_add_3pid_flow_not_supported">Bunu Element mobil ile yapamazsınız</string>
     <string name="settings_add_3pid_authentication_needed">Kimlik doğrulama gereklidir</string>
 
 
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 70a31dfa12..3d09a7fcec 100755
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -96,7 +96,7 @@
     <string name="user_directory_header">Каталог користувачів</string>
     <string name="matrix_only_filter">Лише Matrix-контакти</string>
     <string name="no_conversation_placeholder">Немає діалогів</string>
-    <string name="no_contact_access_placeholder">Ви не надали Riot доступу до контактів</string>
+    <string name="no_contact_access_placeholder">Ви не надали Element доступу до контактів</string>
     <string name="no_result_placeholder">Немає результатів</string>
 
     <!-- Rooms fragment -->
@@ -262,10 +262,10 @@
     <string name="permissions_rationale_msg_record_audio">Для здійснення аудіодзвінків потрібен доступ до мікрофону.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nБудь ласка, надайте його у наступному виринаючому вікні, щоб мати змогу здійснити дзвінок.</string>
     <string name="permissions_rationale_msg_camera_and_audio">Для здійснення відеодзвінків потрібен доступ до камери та мікрофону.\n\nБудь ласка, надайте його у наступних виринаючих вікнах, щоб мати змогу їх здійснити.</string>
-    <string name="permissions_rationale_msg_contacts">Riot потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix за їх email та номерами телефонів.\n\nБудь ласка, надайте його у наступному виринаючому діалозі, щоб знати, які з контактів теж використовують Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix по email чи за номерами телефонів.
+    <string name="permissions_rationale_msg_contacts">Element потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix за їх email та номерами телефонів.\n\nБудь ласка, надайте його у наступному виринаючому діалозі, щоб знати, які з контактів теж використовують Element.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix по email чи за номерами телефонів.
 
-Надати Riot доступ до ваших контактів?</string>
+Надати Element доступ до ваших контактів?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Вибачте.. Дію не виконано через нестачу дозволів</string>
 
@@ -678,7 +678,7 @@
 У майбутньому цей процес верифікації стане більш складним.</string>
     <string name="encryption_information_verify_key_match">Я підтверджую, що ключі співпадають</string>
 
-    <string name="e2e_enabling_on_app_update">Тепер Riot підтримує наскрізне шифрування, але вам треба залогуватися знову, щоб його увімкнути.\n\nМожете зробити це зараз або пізніше у налаштуваннях застосунку.</string>
+    <string name="e2e_enabling_on_app_update">Тепер Element підтримує наскрізне шифрування, але вам треба залогуватися знову, щоб його увімкнути.\n\nМожете зробити це зараз або пізніше у налаштуваннях застосунку.</string>
 
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Кімната містить невідомі пристрої</string>
@@ -850,7 +850,7 @@
     <string name="settings_flair">Настрій</string>
 
     <string name="room_settings_room_notifications_title">Сповіщення</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Для відправлення ключа на цей пристрій, запустіть Riot на іншому пристрої, що може дешифрувати повідомлення.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Для відправлення ключа на цей пристрій, запустіть Element на іншому пристрої, що може дешифрувати повідомлення.</string>
 
     <string name="error_no_external_application_found">Вибачте, жодного стороннього застосунку не знайдено для завершення цієї дії.</string>
 
@@ -924,9 +924,9 @@
     <string name="settings_inline_url_preview">Попередній перегляд посилань</string>
     <string name="settings_preview_media_before_sending">Попередній перегляд медіа перед відправкою</string>
 
-    <string name="startup_notification_privacy_message">Riot.im може працювати у фоновому режимі для керування безпекою та конфіденційністю ваших сповіщень. Це може вплинути на час роботи батареї.</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot збирає анонімну аналітику, щоб ми могли вдосконалювати цей додаток.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Будь ласка, увімкніть аналітику, щоб допомагати нам вдосконалювати Riot.</string>
+    <string name="startup_notification_privacy_message">Element може працювати у фоновому режимі для керування безпекою та конфіденційністю ваших сповіщень. Це може вплинути на час роботи батареї.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element збирає анонімну аналітику, щоб ми могли вдосконалювати цей додаток.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Будь ласка, увімкніть аналітику, щоб допомагати нам вдосконалювати Element.</string>
     <string name="settings_without_flair">Ви наразі не є учасником жодної спільноти.</string>
 
     <string name="room_settings_no_flair">Ця кімната не показує настрій для спільнот</string>
@@ -1107,7 +1107,7 @@
     <string name="markdown_has_been_disabled">Markdown вимкнено.</string>
 
     <string name="settings_call_category">Виклики</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Використовувати стандартний рингтон Riot для вхідних викликів</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Використовувати стандартний рингтон Element для вхідних викликів</string>
     <string name="settings_call_ringtone_title">Рингтон вхідного виклику</string>
     <string name="settings_call_ringtone_dialog_title">Оберіть рингтон для викликів:</string>
 
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 600c08310e..2ef175c90a 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -216,11 +216,11 @@
     <string name="attachment_remaining_time_seconds">%d 秒</string>
     <string name="call_connected">通话已连接</string>
     <string name="call_connecting">通话正在连接…</string>
-    <string name="permissions_rationale_msg_storage">为了发送或保存附件，Riot 需要访问您的图片和视频库。
+    <string name="permissions_rationale_msg_storage">为了发送或保存附件，Element 需要访问您的图片和视频库。
 
 请在接下来弹出的窗口中授权允许访问。</string>
-    <string name="permissions_rationale_msg_camera">为了拍照或进行视频通话，Riot 需要访问您的相机。</string>
-    <string name="permissions_rationale_msg_record_audio">为了进行语音通话，Riot 需要访问您的麦克风。</string>
+    <string name="permissions_rationale_msg_camera">为了拍照或进行视频通话，Element 需要访问您的相机。</string>
+    <string name="permissions_rationale_msg_record_audio">为了进行语音通话，Element 需要访问您的麦克风。</string>
     <string name="room_preview_try_join_an_unknown_room">您试图访问聊天室 %s。您是否愿意加入这个聊天室？</string>
     <string name="room_participants_header_admin_tools">管理工具</string>
     <string name="room_participants_header_direct_chats">私聊</string>
@@ -434,7 +434,7 @@
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 请在接下来弹出的窗口中授权允许访问。</string>
-    <string name="permissions_rationale_msg_camera_and_audio">为了进行视频通话，Riot 需要访问您的相机和麦克风。
+    <string name="permissions_rationale_msg_camera_and_audio">为了进行视频通话，Element 需要访问您的相机和麦克风。
 
 请在接下来弹出的窗口中授权允许访问。</string>
     <string name="permissions_action_not_performed_missing_permissions">对不起。因为权限不足，操作已取消</string>
@@ -505,7 +505,7 @@
     <string name="encryption_information_block">列入黑名单</string>
     <string name="encryption_information_unblock">移出黑名单</string>
 
-    <string name="e2e_enabling_on_app_update">Riot 目前支持端对端加密，但是您需要重新登录以启用它。
+    <string name="e2e_enabling_on_app_update">Element 目前支持端对端加密，但是您需要重新登录以启用它。
 
 您可以现在重新登录，也可以之后再从应用程序设置中选择开启。</string>
 
@@ -518,12 +518,12 @@
 请谅解由此造成的不便。</string>
     <string name="read_receipts_list">已读标签清单</string>
     <string name="compression_options">发送为</string>
-    <string name="permissions_rationale_msg_contacts">Riot 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
+    <string name="permissions_rationale_msg_contacts">Element 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
 
 请在接下来的弹出窗口中授权允许访问。</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
+    <string name="permissions_msg_contacts_warning_other_androids">Element 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
 
-允许 Riot 访问您的通讯录？</string>
+允许 Element 访问您的通讯录？</string>
 
     <string name="room_participants_idle">空闲</string>
 
@@ -585,7 +585,7 @@
     <string name="matrix_only_filter">只显示 Matrix 联系人</string>
     <string name="no_conversation_placeholder">没有对话</string>
     <string name="no_result_placeholder">没有结果</string>
-    <string name="no_contact_access_placeholder">您没有授予 Riot 访问本地通讯录的权限</string>
+    <string name="no_contact_access_placeholder">您没有授予 Element 访问本地通讯录的权限</string>
 
     <!-- Rooms fragment -->
     <string name="rooms_header">聊天室</string>
@@ -822,7 +822,7 @@
         <item quantity="other">%d 条未读消息</item>
     </plurals>
     <string name="startup_notification_privacy_title">通知隐私</string>
-    <string name="startup_notification_privacy_message">Riot 可以在后台运行以安全隐密地管理您的通知（这可能会影响电池消耗）。</string>
+    <string name="startup_notification_privacy_message">Element 可以在后台运行以安全隐密地管理您的通知（这可能会影响电池消耗）。</string>
     <string name="startup_notification_privacy_button_grant">获取权限</string>
     <string name="startup_notification_privacy_button_other">选择其他选项</string>
 
@@ -839,8 +839,8 @@
     <string name="settings_deactivate_my_account">停用我的账户</string>
 
     <string name="settings_opt_in_of_analytics">发送统计分析数据</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot 会收集匿名统计数据来帮助我们改进程序。</string>
-    <string name="settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 Riot。</string>
+    <string name="settings_opt_in_of_analytics_summary">Element 会收集匿名统计数据来帮助我们改进程序。</string>
+    <string name="settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 Element。</string>
     <string name="settings_opt_in_of_analytics_ok">乐意帮忙</string>
 
     <string name="deactivate_account_title">停用账户</string>
@@ -884,7 +884,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="e2e_re_request_encryption_key_sent">已发送密钥共享请求。</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">已请求</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">请在其他可解密此消息的设备上启动 Riot，以便其将密钥发送至当前设备。</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">请在其他可解密此消息的设备上启动 Element，以便其将密钥发送至当前设备。</string>
 
     <string name="lock_screen_hint">在此输入…</string>
 
@@ -983,7 +983,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="auth_accept_policies">请审阅并接受此主服务器的政策：</string>
 
     <string name="settings_call_category">通话</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">为来电使用 Riot 的默认铃声</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">为来电使用 Element 的默认铃声</string>
     <string name="settings_call_ringtone_title">来电铃声</string>
     <string name="settings_call_ringtone_dialog_title">请选择来电铃声：</string>
 
@@ -1014,12 +1014,12 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="settings_troubleshoot_test_device_settings_title">设备设置。</string>
     <string name="settings_troubleshoot_test_device_settings_success">已为此设备启用通知。</string>
     <string name="settings_troubleshoot_test_device_settings_failed">已为此设备禁用通知。
-请检查 Riot 设置。</string>
+请检查 Element 设置。</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">启用</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Play 服务检查</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 服务的 APK 文件可用且为最新版本。</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot 使用 Google Play 服务来推送通知，但它似乎并未正确设置：
+    <string name="settings_troubleshoot_test_play_services_failed">Element 使用 Google Play 服务来推送通知，但它似乎并未正确设置：
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修复 Play 服务</string>
 
@@ -1040,7 +1040,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
 请尝试重启本应用程序。</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">启动服务</string>
 
-    <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 Riot 内置的相机界面。</string>
+    <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 Element 内置的相机界面。</string>
     <string name="settings_labs_enable_send_voice_summary">此选项需要第三方应用程序来录制语音消息。</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">开机时启动</string>
@@ -1060,8 +1060,8 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="settings_show_avatar_display_name_changes_messages">显示账户变动事件</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">包括头像与显示名称的变动。</string>
     <string name="startup_notification_fdroid_battery_optim_title">后台连接</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot需要保持一个低影响的后台连接才能保证可靠的通知。
-在下一个弹出窗口中，系统将提示您允许 Riot 始终在后台运行，请点击“允许“。</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element需要保持一个低影响的后台连接才能保证可靠的通知。
+在下一个弹出窗口中，系统将提示您允许 Element 始终在后台运行，请点击“允许“。</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">授予权限</string>
 
     <string name="account_email_error">在验证您的电子邮件地址时发生了一个错误。</string>
@@ -1074,7 +1074,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="plus_x">+%d</string>
     <string name="generic_label_and_value">%1$s：%2$s</string>
     <string name="generic_label">%1$s：</string>
-    <string name="store_title">Riot.im - 沟通，由你掌控</string>
+    <string name="store_title">Element - 沟通，由你掌控</string>
     <string name="store_short_description">一款完全由你掌控的通用安全聊天应用。</string>
     <string name="show_info_area_always">总是</string>
     <string name="show_info_area_messages_and_errors">消息与错误</string>
@@ -1100,15 +1100,15 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="settings_troubleshoot_test_service_restart_failed">服务重启失败</string>
 
     <string name="settings_troubleshoot_test_service_boot_success">服务将在设备重启后启动。</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">服务不会在设备重启后启动，在您打开 Riot 一次之前您将不会收到消息通知。</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">对 Riot 的后台限制已被关闭。此测试应在移动数据（无Wi-Fi）环境下进行。
+    <string name="settings_troubleshoot_test_service_boot_failed">服务不会在设备重启后启动，在您打开 Element 一次之前您将不会收到消息通知。</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">对 Element 的后台限制已被关闭。此测试应在移动数据（无Wi-Fi）环境下进行。
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">对 Riot 的后台限制已开启。
-Riot 在后台时的工作将被显著的限制，这可能会影响消息通知。
+    <string name="settings_troubleshoot_test_bg_restricted_failed">对 Element 的后台限制已开启。
+Element 在后台时的工作将被显著的限制，这可能会影响消息通知。
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">关闭后台限制</string>
 
-    <string name="settings_troubleshoot_test_battery_success">Riot 未被电池优化影响。</string>
+    <string name="settings_troubleshoot_test_battery_success">Element 未被电池优化影响。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果设备在未充电的情况下关屏静置一段时间，其将进入打盹模式（Doze）。这将阻止应用访问网络并延后其运行、同步、与响铃。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略电池优化</string>
 
@@ -1118,18 +1118,18 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
     <string name="command_problem_with_parameters">指令 %s 需要更多参数，或者有些参数不正确。</string>
     <string name="no_valid_google_play_services_apk">没有可用的 Google Play Services APK。消息通知可能不能正常工作。</string>
 
-    <string name="store_whats_new">"我们在持续改进 Riot.im 的体验。
+    <string name="store_whats_new">"我们在持续改进 Element 的体验。
 完整的 changelog 在这里：%1$s。
 为了不错过新改进，请保持更新开启。"</string>
-    <string name="store_full_description">"一个聊天应用，由你掌控且完全灵活。Riot 让你以你的方式沟通。为 [matrix] - 开放、去中心化的沟通而打造。
+    <string name="store_full_description">"一个聊天应用，由你掌控且完全灵活。Element 让你以你的方式沟通。为 [matrix] - 开放、去中心化的沟通而打造。
 
 获取一个免费的 matrix.org 账号，在 https://modular.im 获取一个你自己的服务器，或者使用其他 Matrix 服务器。
 
-为什么选择 Riot.im?
+为什么选择 Element?
 
 • 完整的沟通：围绕你的团队、你的朋友、你的社区创建聊天室 - 随你喜欢！聊天、分享文件、添加插件和语音视频通话 - 全部免费。
 
-• 强大的集成度：通过你了解和喜欢的工具来使用 Riot.im 。你甚至可以在 Riot.im 上与其他聊天应用的用户和群组聊天。
+• 强大的集成度：通过你了解和喜欢的工具来使用 Element 。你甚至可以在 Element 上与其他聊天应用的用户和群组聊天。
 
 • 隐私和安全：保守你对话的秘密。最先进的端到端加密技术可确保私密通信保持私密性。
 
@@ -1168,11 +1168,11 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
     <string name="settings_troubleshoot_test_bing_settings_quickfix">检查设置</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\n此错误不受 Riot 控制，根据 Google 的说法，此错误表示该设备在 FCM 中注册了太多应用。该错误仅在应用程序数量极多的情况下发生，因此不应影响普通用户。</string>
+\n此错误不受 Element 控制，根据 Google 的说法，此错误表示该设备在 FCM 中注册了太多应用。该错误仅在应用程序数量极多的情况下发生，因此不应影响普通用户。</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\n此错误不受 Riot 控制。它的发生可能有几个原因。也许您稍后重试就有效了，您也可以检查一下 Google Play 服务是否被系统设置限制了数据使用，或者您的设备时钟是否正确，或者可能发生在自定义的 ROM 中。</string>
+\n此错误不受 Element 控制。它的发生可能有几个原因。也许您稍后重试就有效了，您也可以检查一下 Google Play 服务是否被系统设置限制了数据使用，或者您的设备时钟是否正确，或者可能发生在自定义的 ROM 中。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\n此错误不受 Riot 控制。此设备上没有登录 Google 账号。请打开账号管理器并添加一个 Google 账号。</string>
+\n此错误不受 Element 控制。此设备上没有登录 Google 账号。请打开账号管理器并添加一个 Google 账号。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">添加账号</string>
 
     <string name="settings_noisy_notifications_preferences">设置响铃通知</string>
@@ -1192,7 +1192,7 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
     <string name="passphrase_empty_error_message">请输入密码</string>
     <string name="passphrase_passphrase_too_weak">密码太弱</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">如果您想要 Riot 生成一个恢复密钥，请删除密码。</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">如果您想要 Element 生成一个恢复密钥，请删除密码。</string>
     <string name="keys_backup_no_session_error">没有可用的 Matrix 会话</string>
 
     <string name="keys_backup_setup_step1_title">已加密信息永不丢失</string>
@@ -1333,7 +1333,7 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
 
     <string name="autodiscover_invalid_response">无效的主服务器探测响应</string>
     <string name="autodiscover_well_known_autofill_dialog_title">自动完成服务器选项</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot 侦测到您的 userId 域名 \"%1$s\" 有自定义的服务器设置：
+    <string name="autodiscover_well_known_autofill_dialog_message">Element 侦测到您的 userId 域名 \"%1$s\" 有自定义的服务器设置：
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">使用设置</string>
 
@@ -1458,7 +1458,7 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
     <string name="preference_root_help_about">帮助和关于</string>
 
 
-    <string name="store_riotx_title">RiotX - -下一代 Matrix 客户端</string>
+    <string name="store_riotx_title">Element - -下一代 Matrix 客户端</string>
     <string name="edited_suffix">（已编辑）</string>
 
     <string name="none">无</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 5771f648af..b91b332007 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -94,7 +94,7 @@
     <string name="user_directory_header">使用者目錄</string>
     <string name="matrix_only_filter">僅 Matrix 聯絡人</string>
     <string name="no_conversation_placeholder">沒有對話</string>
-    <string name="no_contact_access_placeholder">您沒有允許 Riot 存取裝置上的聯絡資訊</string>
+    <string name="no_contact_access_placeholder">您沒有允許 Element 存取裝置上的聯絡資訊</string>
     <string name="no_result_placeholder">沒有結果</string>
 
     <string name="rooms_header">聊天室</string>
@@ -254,22 +254,22 @@
     <string name="media_picker_cannot_record_video">無法錄影</string>
 
     <string name="permissions_rationale_popup_title">資訊</string>
-    <string name="permissions_rationale_msg_storage">Riot 需要權限來存取你的照片與影片庫，以傳送及儲存附件。
+    <string name="permissions_rationale_msg_storage">Element 需要權限來存取你的照片與影片庫，以傳送及儲存附件。
 
 請在下個彈跳視窗允許存取，來從手機傳送檔案。</string>
-    <string name="permissions_rationale_msg_camera">Riot 需要權限存取您的相機，來拍照與視訊通話。</string>
+    <string name="permissions_rationale_msg_camera">Element 需要權限存取您的相機，來拍照與視訊通話。</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \n為了要通話，請在下個彈跳視窗中允許存取。"</string>
-    <string name="permissions_rationale_msg_record_audio">Riot 需要權限來存取麥克風，來撥打語音通話。</string>
+    <string name="permissions_rationale_msg_record_audio">Element 需要權限來存取麥克風，來撥打語音通話。</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \n為了要通話，請在下個彈跳視窗中允許存取。"</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot 需要權限來存取相機及麥克風來撥打視訊通話。
+    <string name="permissions_rationale_msg_camera_and_audio">Element 需要權限來存取相機及麥克風來撥打視訊通話。
 
 為了要通話，請在下個彈跳視窗中允許存取。</string>
-    <string name="permissions_rationale_msg_contacts">Riot 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。如果您同意為此用途分享您的電話簿，請在下一個彈出式視窗中允許存取權限。</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。
+    <string name="permissions_rationale_msg_contacts">Element 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。如果您同意為此用途分享您的電話簿，請在下一個彈出式視窗中允許存取權限。</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。
 \n
 \n您同意為此用途分享您的電話簿嗎？</string>
 
@@ -403,7 +403,7 @@
     <string name="e2e_re_request_encryption_key_sent">已發送金鑰分享請求。</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">已發送請求</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">"請在另一個可以解密訊息的裝置上啟動  Riot.im, 以便它將金鑰發送到此工作階段。"</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">"請在另一個可以解密訊息的裝置上啟動  Element, 以便它將金鑰發送到此工作階段。"</string>
 
     <string name="ssl_expected_existing_expl">憑證已從以前受信任的更改為不受信任的憑證。伺服器可能已續訂其憑證。請與伺服器管理員聯繫以尋找所需的指紋。</string>
     <string name="ssl_only_accept">僅當伺服器管理員發佈的指紋與上面的指紋匹配時才接受此憑證。</string>
@@ -545,13 +545,13 @@
     <string name="settings_deactivate_my_account">停用我的帳號</string>
 
     <string name="startup_notification_privacy_title">通知隱私</string>
-    <string name="startup_notification_privacy_message">Riot 可以在後臺安全隱密地管理通知。這可能會影響電池的使用。</string>
+    <string name="startup_notification_privacy_message">Element 可以在後臺安全隱密地管理通知。這可能會影響電池的使用。</string>
     <string name="startup_notification_privacy_button_grant">獲取權限</string>
     <string name="startup_notification_privacy_button_other">選擇其他選項</string>
 
     <string name="settings_analytics">傳送分析資料</string>
     <string name="settings_opt_in_of_analytics">傳送分析資料</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot 會收集匿名分析以讓我們可以改進此應用程式。</string>
+    <string name="settings_opt_in_of_analytics_summary">Element 會收集匿名分析以讓我們可以改進此應用程式。</string>
     <string name="settings_opt_in_of_analytics_prompt">請允許收集匿名分析以讓我們可以改進此應用程式。</string>
     <string name="settings_opt_in_of_analytics_ok">是的，我想要協助！</string>
 
@@ -740,7 +740,7 @@
     <string name="encryption_information_verify_device_warning2">如果不符合的話，您的通訊安全可能正受到威脅。</string>
     <string name="encryption_information_verify_key_match">我驗證金鑰相符</string>
 
-    <string name="e2e_enabling_on_app_update">Riot 目前支援端到端加密，但您需要重新登入以啟用。
+    <string name="e2e_enabling_on_app_update">Element 目前支援端到端加密，但您需要重新登入以啟用。
 \n
 \n您可以現在重新登入或稍後在應用程式設定中進行。</string>
 
@@ -991,7 +991,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="x_plus">%d+</string>
 
     <string name="settings_call_category">通話</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">為來電使用預設的 Riot 鈴聲</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">為來電使用預設的 Element 鈴聲</string>
     <string name="settings_call_ringtone_title">來電鈴聲</string>
     <string name="settings_call_ringtone_dialog_title">選取通話鈴聲：</string>
 
@@ -1024,12 +1024,12 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_troubleshoot_test_device_settings_title">工作階段設定。</string>
     <string name="settings_troubleshoot_test_device_settings_success">通知已為此工作階段啟用。</string>
     <string name="settings_troubleshoot_test_device_settings_failed">此工作階段未啟用通知。
-\n請檢查 Riot 設定。</string>
+\n請檢查 Element 設定。</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">啟用</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Play 服務檢查</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 服務 APK 可用且已為最新。</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot 使用 Google Play 服務來傳遞推送訊息，但它似乎並未正確設定：
+    <string name="settings_troubleshoot_test_play_services_failed">Element 使用 Google Play 服務來傳遞推送訊息，但它似乎並未正確設定：
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修復 Play 服務</string>
 
@@ -1056,25 +1056,25 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="settings_troubleshoot_test_service_boot_title">開機時啟動</string>
     <string name="settings_troubleshoot_test_service_boot_success">服務將會在裝置重新啟動時自行啟動。</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">服務不會在裝置重心啟動時自行啟動，您將不能在 Riot 開啟前收到通知。</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">服務不會在裝置重心啟動時自行啟動，您將不能在 Element 開啟前收到通知。</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">啟用開機時啟動</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">檢查背景限制</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">背景限制已為 Riot 停用。本測試應該使用行動數據執行（不是 WiFi）。
+    <string name="settings_troubleshoot_test_bg_restricted_success">背景限制已為 Element 停用。本測試應該使用行動數據執行（不是 WiFi）。
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">背景限制已為 Riot 啟用。
+    <string name="settings_troubleshoot_test_bg_restricted_failed">背景限制已為 Element 啟用。
 應用程式要在背景執行的工作將被顏格限制，這可能會影響通知。
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">停用限制</string>
 
     <string name="settings_troubleshoot_test_battery_title">電池最佳化</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot 不會被電池最佳化影響。</string>
+    <string name="settings_troubleshoot_test_battery_success">Element 不會被電池最佳化影響。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果使用者不為裝置充電，並讓其靜置一段時間，且將螢幕關閉，裝置將會進入 Doze 模式。這可能會導致應用程式無法存取網路，並延遲它們的工作、同步與標準警報。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略最佳化</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">背景連線</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot 需要保持最低影響的背景連線以接收可靠的通知。
-在下一個畫面，您必須允許 Riot 總是在背景執行，請接受。</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element 需要保持最低影響的背景連線以接收可靠的通知。
+在下一個畫面，您必須允許 Element 總是在背景執行，請接受。</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">授予權限</string>
 
     <string name="account_email_error">當驗證您的電子郵件地址時遇到錯誤。</string>
@@ -1084,17 +1084,17 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="no_valid_google_play_services_apk">找不到有效的 Google Play 服務 APK。通知可能無法正常運作。</string>
 
-    <string name="store_title">Riot.im - 以您的方式溝通</string>
+    <string name="store_title">Element - 以您的方式溝通</string>
     <string name="store_short_description">一個完全由您控制的安全聊天應用程式。</string>
-    <string name="store_full_description">"完全由您控制且極具彈性的聊天應用程式。Riot 讓您以您想要的方式溝通。為 [matrix] 而生，其為開放、去中心化的通訊標準。
+    <string name="store_full_description">"完全由您控制且極具彈性的聊天應用程式。Element 讓您以您想要的方式溝通。為 [matrix] 而生，其為開放、去中心化的通訊標準。
 
 取得免費的 matrix.org 帳號，在 https://modular.im 取得您自己的伺服器，或是使用其他的 Matrix 伺服器。
 
-為什麼選擇 Riot.im？
+為什麼選擇 Element？
 
 • 完整的溝通：與您的團隊、朋友、社群一同建構聊天室，不管您喜歡什麼都可以！聊天、分享檔案、新增小工具與進行語音和視訊通話，全都是免費的。
 
-• 強大的整合：與您知道且所愛的工具一同使用 Riot.im。使用 Riot.im，您甚至可以與其他聊天應用程式的使用者與群組聊天。
+• 強大的整合：與您知道且所愛的工具一同使用 Element。使用 Element，您甚至可以與其他聊天應用程式的使用者與群組聊天。
 
 • 隱密且安全：讓您的對話保持隱密。最先進的端到端加密確保隱密的溝通會繼續保持隱密。
 
@@ -1104,7 +1104,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="video_call_in_progress">視訊通話進行中……</string>
 
-    <string name="store_whats_new">"我們會不斷為 Riot.im 做出變更與改善。
+    <string name="store_whats_new">"我們會不斷為 Element 做出變更與改善。
 完整的變更紀錄可以在此找到：%1$s。
 為了確保您不會錯過任何事情，只要把更新打開就行了。"</string>
     <string name="title_activity_keys_backup_setup">金鑰備份</string>
@@ -1125,11 +1125,11 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_troubleshoot_test_bing_settings_quickfix">檢查設定</string>
 
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-這個錯誤並非 Riot 所能控制，而是與 Google 有關，這個錯誤代表裝置註冊了太多使用 FCM 的應用程式。這個錯誤只會發生在有超大量的應用程式的裝置上，所以不應該影響一般的使用者。</string>
+這個錯誤並非 Element 所能控制，而是與 Google 有關，這個錯誤代表裝置註冊了太多使用 FCM 的應用程式。這個錯誤只會發生在有超大量的應用程式的裝置上，所以不應該影響一般的使用者。</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-這個錯誤並非 Riot 所能控制。可能由多種原因所導致。也可能會在稍後重試時就可以運作，您也可以檢查 Google Play 服務在系統設定中有沒有被限制使用資料，或是您裝置的時鐘是否正確，或是也可能會在自訂的 ROM 上發生。</string>
+這個錯誤並非 Element 所能控制。可能由多種原因所導致。也可能會在稍後重試時就可以運作，您也可以檢查 Google Play 服務在系統設定中有沒有被限制使用資料，或是您裝置的時鐘是否正確，或是也可能會在自訂的 ROM 上發生。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-這個錯誤並非 Riot 所能控制。手機上沒有 Google 帳號。請開啟帳號管理員並新增一個 Google 帳號。</string>
+這個錯誤並非 Element 所能控制。手機上沒有 Google 帳號。請開啟帳號管理員並新增一個 Google 帳號。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">新增帳號</string>
 
     <string name="settings_noisy_notifications_preferences">設定吵鬧的通知</string>
@@ -1145,7 +1145,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="passphrase_empty_error_message">請輸入通關密語</string>
     <string name="passphrase_passphrase_too_weak">通關密語太弱了</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">如果您想要讓 Riot 生成復原金鑰的話，請刪除通關密語。</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">如果您想要讓 Element 生成復原金鑰的話，請刪除通關密語。</string>
     <string name="keys_backup_no_session_error">沒有可用的 Matrix 工作階段</string>
 
     <string name="keys_backup_setup_step1_title">永不遺失已加密的訊息</string>
@@ -1305,7 +1305,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="autodiscover_invalid_response">無效的家伺服器探索回應</string>
     <string name="autodiscover_well_known_autofill_dialog_title">自動完成伺服器選項</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot 偵測到您的 userId 網域「%1$s」有自訂的伺服器設定：
+    <string name="autodiscover_well_known_autofill_dialog_message">Element 偵測到您的 userId 網域「%1$s」有自訂的伺服器設定：
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">使用設定</string>
 
@@ -1443,7 +1443,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="group_all_communities">所有社群</string>
 
     <string name="room_preview_no_preview">無法預覽此聊天室</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">RiotX 尚不支援預覽所有人皆可讀的聊天室</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Element 尚不支援預覽所有人皆可讀的聊天室</string>
 
     <string name="fab_menu_create_room">聊天室</string>
     <string name="fab_menu_create_chat">直接訊息</string>
@@ -1460,7 +1460,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_unable_to_get_keys_backup_data">取得金鑰備份資料時發生錯誤</string>
 
     <string name="alpha_disclaimer_title">歡迎使用測試版！</string>
-    <string name="alpha_disclaimer_content_line_1">RiotX 還在早期開發階段，可能會缺少某些功能，您可能會遇到臭蟲。</string>
+    <string name="alpha_disclaimer_content_line_1">Element 還在早期開發階段，可能會缺少某些功能，您可能會遇到臭蟲。</string>
     <string name="alpha_disclaimer_content_line_2_gplay">最新的功能清單一直都會在 %1$s，如果您發現臭蟲，請在首頁左上角的選單中遞交回報，我們將會盡快修復。</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play 商店描述</string>
     <string name="alpha_disclaimer_content_line_2_fdroid">如果您發現臭蟲，請在首頁左上角的選單中遞交回報，我們將會盡快修復。</string>
@@ -1502,15 +1502,15 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="settings_labs_show_hidden_events_in_timeline">在時間軸中顯示隱藏的活動</string>
 
-    <string name="store_riotx_title">RiotX - 下一代的 Matrix 客戶端</string>
+    <string name="store_riotx_title">Element - 下一代的 Matrix 客戶端</string>
     <string name="store_riotx_short_description">使用最新 Android 框架的 Matrix 較快且輕量的客戶端</string>
-    <string name="store_riotx_full_description">RiotX 是 Matrix 協定 (Matrix.org) 的新客戶端：安全、去中心化通訊的開放網路。RiotX 是 Riot Android 客戶端的完全重寫，以 Matrix Android SDK 的完全重寫為基礎。
+    <string name="store_riotx_full_description">Element 是 Matrix 協定 (Matrix.org) 的新客戶端：安全、去中心化通訊的開放網路。Element 是 Riot Android 客戶端的完全重寫，以 Matrix Android SDK 的完全重寫為基礎。
 \n
-\n免責聲明：這是測試版。RiotX 目前仍在積極開發中，包含限制與（我們希望不多的）臭蟲。所有的回饋都很歡迎！
+\n免責聲明：這是測試版。Element 目前仍在積極開發中，包含限制與（我們希望不多的）臭蟲。所有的回饋都很歡迎！
 \n
-\nRiotX 支援：• 登入到既有的帳號 • 建立聊天室與加入公開聊天室 • 接受與回絕邀請 • 列出使用者聊天室 • 檢視聊天室詳細資訊 • 傳送文字訊息 • 傳送附件 • 讀取與編寫已加密的聊天室 • 加密：E2E 金鑰備份、進階裝置驗證、金鑰分享請求與回應 • 推送通知 • 亮、暗與黑色主題
+\nElement 支援：• 登入到既有的帳號 • 建立聊天室與加入公開聊天室 • 接受與回絕邀請 • 列出使用者聊天室 • 檢視聊天室詳細資訊 • 傳送文字訊息 • 傳送附件 • 讀取與編寫已加密的聊天室 • 加密：E2E 金鑰備份、進階裝置驗證、金鑰分享請求與回應 • 推送通知 • 亮、暗與黑色主題
 \n
-\n不是所有 Riot 的功能都已在 RiotX 中實作。主要缺少（會在稍後到來！）的功能 • 聊天室設定（列出聊天室成員等） • 通話 • 小工具 • …</string>
+\n不是所有 Element 的功能都已在 Element 中實作。主要缺少（會在稍後到來！）的功能 • 聊天室設定（列出聊天室成員等） • 通話 • 小工具 • …</string>
 
     <string name="bottom_action_people_x">直接訊息</string>
 
@@ -1562,7 +1562,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="widget_integration_review_terms">要繼續，您必須接受此服務的條款。</string>
 
-    <string name="security_warning_identity_server">先前版本的 Riot 有一個安全性問題，讓您的身份識別伺服器 (%1$s) 存取您的帳號。如果您信任 %2$s，您可以忽略這個；否則請登出再登入。
+    <string name="security_warning_identity_server">先前版本的 Element 有一個安全性問題，讓您的身份識別伺服器 (%1$s) 存取您的帳號。如果您信任 %2$s，您可以忽略這個；否則請登出再登入。
 \n
 \n在此閱讀更多詳細資訊：
 \nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
@@ -1596,11 +1596,11 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="invite_no_identity_server_error">在您的設定中新增一臺身份識別伺服器以執行此動作。</string>
     <string name="settings_background_fdroid_sync_mode">背景同步模式（實驗性）</string>
     <string name="settings_background_fdroid_sync_mode_battery">為電池最佳化</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot 將會在背景同步以節省裝置的有限資源（電池）。
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element 將會在背景同步以節省裝置的有限資源（電池）。
 \n取決於您裝置的資源狀態，作業系統可能會延遲同步。</string>
     <string name="settings_background_fdroid_sync_mode_real_time">為即時作業最佳化</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot 將會精準地定期在背景同步（可設定）。
-\n這會影響到網路與電池的使用，並會顯示指出 Riot 正在監聽某事件的永久通知。</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element 將會精準地定期在背景同步（可設定）。
+\n這會影響到網路與電池的使用，並會顯示指出 Element 正在監聽某事件的永久通知。</string>
     <string name="settings_background_fdroid_sync_mode_disabled">無背景同步</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">當應用程式在背景時，您將不會收到訊息通知。</string>
     <string name="settings_background_sync_update_error">更新設定失敗。</string>
@@ -1702,7 +1702,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n
 \n如果您不想要看到從此使用者而來的更多內容，您可以封鎖他以隱藏他的訊息</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot 需要權限以在磁碟上儲存您的 E2E 金鑰。
+    <string name="permissions_rationale_msg_keys_backup_export">Element 需要權限以在磁碟上儲存您的 E2E 金鑰。
 \n
 \n請在下個彈出視窗中允許存取以讓您可以手動匯出您的金鑰。</string>
 
@@ -1711,7 +1711,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="resources_script">Latn</string>
 
     <string name="settings_add_3pid_confirm_password_title">確認您的密碼</string>
-    <string name="settings_add_3pid_flow_not_supported">您無法在行動裝置上的 Riot 做這件事</string>
+    <string name="settings_add_3pid_flow_not_supported">您無法在行動裝置上的 Element 做這件事</string>
     <string name="settings_add_3pid_authentication_needed">需要驗證</string>
 
 
@@ -1784,18 +1784,18 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="login_continue">繼續</string>
     <string name="login_connect_to">連線到 %1$s</string>
-    <string name="login_connect_to_modular">連線到 Modular</string>
+    <string name="login_connect_to_modular">連線到 Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">連線到自訂伺服器</string>
     <string name="login_signin_to">登入到 %1$s</string>
     <string name="login_signup">註冊</string>
     <string name="login_signin">登入</string>
     <string name="login_signin_sso">以 SSO 繼續</string>
 
-    <string name="login_server_url_form_modular_hint">Modular 位置</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services 位置</string>
     <string name="login_server_url_form_other_hint">位置</string>
     <string name="login_server_url_form_modular_text">組織有專業主機</string>
-    <string name="login_server_url_form_modular_notice">輸入 Modular Riot 或您想要使用的伺服器位置</string>
-    <string name="login_server_url_form_other_notice">輸入您想要連線的伺服器或 Riot 的位置</string>
+    <string name="login_server_url_form_modular_notice">輸入 Modular Element 或您想要使用的伺服器位置</string>
+    <string name="login_server_url_form_other_notice">輸入您想要連線的伺服器或 Element 的位置</string>
 
     <string name="login_sso_error_message">載入頁面時發生錯誤：%1$s (%2$d)</string>
     <string name="login_mode_not_supported">應用程式無法登入此家伺服器。家伺服器支援以下登入類型：%1$s。
@@ -1868,7 +1868,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n停止註冊程序？</string>
 
     <string name="login_a11y_choose_matrix_org">選取 matrix.org</string>
-    <string name="login_a11y_choose_modular">選取 modular</string>
+    <string name="login_a11y_choose_modular">選取 Element Matrix Services</string>
     <string name="login_a11y_choose_other">選取自訂的家伺服器</string>
     <string name="login_a11y_captcha_container">請執行 captcha 挑戰</string>
     <string name="login_terms_title">接受條款以繼續</string>
@@ -1913,7 +1913,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n再次登入以存取您的帳號資料與訊息。</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">除非您登入以復原您的加密金鑰，否則您將會失去對安全訊息的存取權。</string>
     <string name="soft_logout_clear_data_dialog_submit">清除資料</string>
-    <string name="soft_logout_sso_not_same_user_error">使用者 %1$s 目前的工作階段與您提供的使用者 %2$s 憑證。RiotX 並不支援。
+    <string name="soft_logout_sso_not_same_user_error">使用者 %1$s 目前的工作階段與您提供的使用者 %2$s 憑證。Element 並不支援。
 \n請先清除您的資料，然後再以其他帳號登入。</string>
 
     <string name="permalink_malformed">您的 matrix.to 連結格式錯誤</string>
@@ -1936,7 +1936,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="autocomplete_limited_results">僅顯示第一個結果，輸入更多字母……</string>
 
     <string name="settings_developer_mode_fail_fast_title">快速失敗</string>
-    <string name="settings_developer_mode_fail_fast_summary">在發生非預期的錯誤時，RiotX 可能更常當機</string>
+    <string name="settings_developer_mode_fail_fast_summary">在發生非預期的錯誤時，Element 可能更常當機</string>
     <string name="command_description_verify">請求驗證給定的 userID</string>
     <string name="command_description_shrug">"將  ¯\\_(ツ)_/¯ 附加到純文字訊息中"</string>
 
@@ -2025,9 +2025,9 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="room_member_jump_to_read_receipt">跳至讀取回條</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">RiotX 無法處理類型為「%1$s」的事件</string>
-    <string name="rendering_event_error_type_of_message_not_handled">RiotX 無法處理類型為「%1$s」的訊息</string>
-    <string name="rendering_event_error_exception">在彩現 id「%1$s」事件的內容時，RiotX 遇到問題</string>
+    <string name="rendering_event_error_type_of_event_not_handled">Element 無法處理類型為「%1$s」的事件</string>
+    <string name="rendering_event_error_type_of_message_not_handled">Element 無法處理類型為「%1$s」的訊息</string>
+    <string name="rendering_event_error_exception">在彩現 id「%1$s」事件的內容時，Element 遇到問題</string>
 
     <string name="unignore">取消忽略</string>
 
@@ -2153,7 +2153,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="keys_backup_restore_success_title_already_up_to_date">金鑰已為最新！</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">金鑰請求</string>
 
@@ -2292,13 +2292,13 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="error_adding_media_file_to_gallery">無法新增媒體檔案到媒體庫中</string>
     <string name="change_password_summary">設定新的帳號密碼……</string>
 
-    <string name="use_other_session_content_description">在您的其他裝置上使用最新的 Riot、Riot Web、Riot 桌面版、Riot iOS、RiotX for Android 或其他有交叉簽章功能的 Matrix 客戶端</string>
-    <string name="riot_desktop_web">Riot Web
-\nRiot 桌面版</string>
-    <string name="riot_ios_android">Riot iOS
-\nRiot X for Android</string>
+    <string name="use_other_session_content_description">在您的其他裝置上使用最新的 Element、Element Web、Element 桌面版、Element iOS、Element for Android 或其他有交叉簽章功能的 Matrix 客戶端</string>
+    <string name="riot_desktop_web">Element Web
+\nElement 桌面版</string>
+    <string name="riot_ios_android">Element iOS
+\nElement for Android</string>
     <string name="or_other_mx_capabale_client">或其他有交叉簽章功能的 Matrix 客戶端</string>
-    <string name="use_latest_riot">在您的其他裝置上使用最新的 Riot：</string>
+    <string name="use_latest_riot">在您的其他裝置上使用最新的 Element：</string>
     <string name="command_description_discard_session">強制丟棄目前在加密聊天室中的外發群組工作階段</string>
     <string name="command_description_discard_session_not_handled">僅在加密聊天室中支援</string>
     <string name="enter_secret_storage_passphrase_or_key">使用您的 %1$s 或使用您的 %2$s 以繼續。</string>
@@ -2369,11 +2369,11 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="open_terms_of">開啟 %s 的條款</string>
     <string name="disconnect_identity_server_dialog_content">從身份識別伺服器 %s 斷線？</string>
-    <string name="identity_server_error_outdated_identity_server">此身份識別伺服器太舊了。RiotX 僅支援 API V2。</string>
+    <string name="identity_server_error_outdated_identity_server">此身份識別伺服器太舊了。Element 僅支援 API V2。</string>
     <string name="identity_server_error_outdated_home_server">此動作是不可能的。家伺服器太舊了。</string>
     <string name="identity_server_error_no_identity_server_configured">請先設定身份識別伺服器。</string>
     <string name="identity_server_error_terms_not_signed">請先在設定中同意身份識別伺服器的條款。</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，RiotX 僅支援傳送雜湊過的使用者電子郵件與電話號碼。</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，Element 僅支援傳送雜湊過的使用者電子郵件與電話號碼。</string>
     <string name="identity_server_error_binding_error">關聯失敗。</string>
     <string name="identity_server_error_no_current_binding_error">目前沒有此識別符的關聯。</string>
 
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 80ecf32029..dd2fbfce7a 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -3,12 +3,6 @@
 
     <declare-styleable name="VectorStyles">
 
-        <attr name="vctr_bottom_nav_background_color" format="color" />
-        <attr name="vctr_bottom_nav_background_border_color" format="color" />
-
-        <!-- waiting view background -->
-        <attr name="vctr_waiting_background_color" format="color" />
-
         <!-- application bar text color -->
         <attr name="vctr_toolbar_primary_text_color" format="color" />
         <attr name="vctr_toolbar_secondary_text_color" format="color" />
@@ -46,7 +40,6 @@
         <attr name="vctr_list_header_primary_text_color" format="color" />
         <attr name="vctr_list_header_secondary_text_color" format="color" />
 
-        <attr name="vctr_list_bottom_sheet_divider_color" format="color" />
         <attr name="vctr_list_divider_color" format="color" />
 
         <attr name="vctr_redacted_message_color" format="color" />
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index c9d1c2a223..4116e76f5d 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -4,8 +4,8 @@
     <!-- Source: https://zpl.io/aBKw9Mk -->
 
     <!-- Accents -->
-    <color name="riotx_accent">#FF03B381</color>
-    <color name="riotx_accent_alpha25">#3F03B381</color>
+    <color name="riotx_accent">#FF0DBD8B</color>
+    <color name="riotx_accent_alpha25">#3F0DBD8B</color>
 
 
     <color name="riotx_destructive_accent">#FFFF4B55</color>
@@ -13,9 +13,9 @@
     <color name="riotx_button_primary_accent_alpha12">#14368BD6</color>
 
 
-    <color name="riotx_positive_accent">#03B381</color>
-    <color name="riotx_disabled_accent">#61708B</color>
-    <color name="riotx_positive_accent_alpha12">#1E03B381</color>
+    <color name="riotx_positive_accent">#0DBD8B</color>
+    <color name="riotx_disabled_accent">#C4C4C4</color>
+    <color name="riotx_positive_accent_alpha12">#1E0DBD8B</color>
     <color name="riotx_button_disabled_alpha12">#1E61708B</color>
 
 
@@ -24,13 +24,13 @@
     <color name="riotx_notice_secondary_alpha12">#1E61708B</color>
     <color name="riotx_links">#FF368BD6</color>
 
-    <color name="riotx_avatar_fill_1">#FF03b381</color>
+    <color name="riotx_avatar_fill_1">#FF03B381</color>
     <color name="riotx_avatar_fill_2">#FF368bd6</color>
     <color name="riotx_avatar_fill_3">#FFac3ba8</color>
 
     <color name="riotx_username_1">#368bd6</color>
     <color name="riotx_username_2">#ac3ba8</color>
-    <color name="riotx_username_3">#03b381</color>
+    <color name="riotx_username_3">#03B381</color>
     <color name="riotx_username_4">#e64f7a</color>
     <color name="riotx_username_5">#ff812d</color>
     <color name="riotx_username_6">#2dc2c5</color>
@@ -48,13 +48,19 @@
 
     <attr name="riotx_background" format="color" />
     <color name="riotx_background_light">#FFFFFFFF</color>
-    <color name="riotx_background_dark">#FF181B21</color>
+    <color name="riotx_background_dark">#FF15191E</color>
     <color name="riotx_background_black">#FF000000</color>
 
     <attr name="riotx_base" format="color" />
-    <color name="riotx_base_light">#FF27303A</color>
-    <color name="riotx_base_dark">#FF15171B</color>
-    <color name="riotx_base_black">#FF060708</color>
+    <color name="riotx_base_light">#FFF5F7FA</color>
+    <color name="riotx_base_dark">#FF22282F</color>
+    <color name="riotx_base_black">#FF000000</color>
+
+    <!-- Background color of bottom sheets -->
+    <attr name="riotx_bottom_sheet_background" format="color" />
+    <color name="riotx_bottom_sheet_background_light">#FFFFFFFF</color>
+    <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
+    <color name="riotx_bottom_sheet_background_black">#FF000000</color>
 
     <attr name="riotx_base_text_icon_primary" format="color" />
     <color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
@@ -82,14 +88,14 @@
     <color name="riotx_header_panel_border_mobile_black">#FF0D0F12</color>
 
     <attr name="riotx_header_panel_text_primary" format="color" />
-    <color name="riotx_header_panel_text_primary_light">#FF61708B</color>
-    <color name="riotx_header_panel_text_primary_dark">#FFA1B2D1</color>
-    <color name="riotx_header_panel_text_primary_black">#FFA1B2D1</color>
+    <color name="riotx_header_panel_text_primary_light">#FF171910</color>
+    <color name="riotx_header_panel_text_primary_dark">#FFFFFFFF</color>
+    <color name="riotx_header_panel_text_primary_black">#FFFFFFFF</color>
 
     <attr name="riotx_header_panel_text_secondary" format="color" />
-    <color name="riotx_header_panel_text_secondary_light">#FFC8C8CD</color>
-    <color name="riotx_header_panel_text_secondary_dark">#FFC8C8CD</color>
-    <color name="riotx_header_panel_text_secondary_black">#FFC8C8CD</color>
+    <color name="riotx_header_panel_text_secondary_light">#8F97A3</color>
+    <color name="riotx_header_panel_text_secondary_dark">#FFA9B2BC</color>
+    <color name="riotx_header_panel_text_secondary_black">#FFA9B2BC</color>
 
     <attr name="riotx_text_primary" format="color" />
     <color name="riotx_text_primary_light">#FF2E2F32</color>
@@ -107,19 +113,19 @@
     <color name="riotx_text_primary_body_contrast_black">#FFA1B2D1</color>
 
     <attr name="riotx_android_secondary" format="color" />
-    <color name="riotx_android_secondary_light">#FF7E899C</color>
-    <color name="riotx_android_secondary_dark">#FF7E899C</color>
-    <color name="riotx_android_secondary_black">#FF7E899C</color>
+    <color name="riotx_android_secondary_light">#FF8F97A3</color>
+    <color name="riotx_android_secondary_dark">#FF8F97A3</color>
+    <color name="riotx_android_secondary_black">#FFA9B2BC</color>
 
     <attr name="riotx_search_placeholder" format="color" />
-    <color name="riotx_search_placeholder_light">#FF61708B</color>
-    <color name="riotx_search_placeholder_dark">#FF61708B</color>
-    <color name="riotx_search_placeholder_black">#FF61708B</color>
+    <color name="riotx_search_placeholder_light">#FF8F97A3</color>
+    <color name="riotx_search_placeholder_dark">#FFA9B2BC</color>
+    <color name="riotx_search_placeholder_black">#FFA9B2BC</color>
 
     <attr name="riotx_room_highlight" format="color" />
-    <color name="riotx_room_highlight_light">#FFFFFFFF</color>
+    <color name="riotx_room_highlight_light">#FFF6F7F8</color>
     <color name="riotx_room_highlight_dark">#FF343446</color>
-    <color name="riotx_room_highlight_black">#FF22262E</color>
+    <color name="riotx_room_highlight_black">#FF343446</color>
 
     <attr name="riotx_unread_room_indent" format="color" />
     <color name="riotx_unread_room_indent_light">#FF2E3648</color>
@@ -129,12 +135,12 @@
     <attr name="riotx_android_status_bar" format="color" />
     <color name="riotx_android_status_bar_light">#FF2E3648</color>
     <color name="riotx_android_status_bar_dark">#FF0D0E10</color>
-    <color name="riotx_android_status_bar_black">#FF000000</color>
+    <color name="riotx_android_status_bar_black">#FF0D0E10</color>
 
     <attr name="riotx_line_break_mobile" format="color" />
     <color name="riotx_line_break_mobile_light">#FFEEEFEF</color>
     <color name="riotx_line_break_mobile_dark">#FF61708B</color>
-    <color name="riotx_line_break_mobile_black">#FF22262E</color>
+    <color name="riotx_line_break_mobile_black">#FF61708B</color>
 
     <!-- Other colors, which are not in the pallette -->
     <attr name="riotx_unread_room_badge" format="color" />
@@ -187,6 +193,37 @@
     <color name="riotx_room_active_widgets_banner_text_dark">#E3E8F0</color>
     <color name="riotx_room_active_widgets_banner_text_black">#E3E8F0</color>
 
+    <attr name="riotx_bottom_nav_background_color" format="color" />
+    <color name="riotx_bottom_nav_background_color_light">@color/riot_primary_background_color_light</color>
+    <color name="riotx_bottom_nav_background_color_dark">@color/primary_color_dark</color>
+    <color name="riotx_bottom_nav_background_color_black">@color/primary_color_black</color>
+    <color name="riotx_bottom_nav_background_color_status">@color/riot_primary_background_color_status</color>
+
+    <attr name="riotx_bottom_nav_background_border_color" format="color" />
+    <color name="riotx_bottom_nav_background_border_color_light">#E9EDF1</color>
+    <color name="riotx_bottom_nav_background_border_color_dark">#55555555</color>
+    <color name="riotx_bottom_nav_background_border_color_black">#FF15171b</color>
+    <color name="riotx_bottom_nav_background_border_color_status">#FFE9EDF1</color>
+
+    <attr name="riotx_bottom_nav_icon_color" format="color" />
+    <color name="riotx_bottom_nav_icon_color_light">#C1C6CD</color>
+    <color name="riotx_bottom_nav_icon_color_dark">#8E99A4</color>
+    <color name="riotx_bottom_nav_icon_color_black">#8E99A4</color>
+
+    <attr name="riotx_waiting_background_color" format="color" />
+    <color name="riotx_waiting_background_color_light">#AAAAAAAA</color>
+    <color name="riotx_waiting_background_color_dark">#55555555</color>
+    <color name="riotx_waiting_background_color_status">#AAAAAAAA</color>
+
+    <attr name="riotx_disabled_view_color" format="color" />
+    <color name="riotx_disabled_view_color_light">#EEEEEE</color>
+    <color name="riotx_disabled_view_color_dark">#61708B</color>
+
+    <attr name="riotx_list_bottom_sheet_divider_color" format="color" />
+    <color name="riotx_list_bottom_sheet_divider_color_light">#EEEFEF</color>
+    <color name="riotx_list_bottom_sheet_divider_color_dark">#FF61708B</color>
+    <color name="riotx_list_bottom_sheet_divider_color_black">#FF22262E</color>
+
     <!-- (color from RiotWeb) -->
     <attr name="riotx_keys_backup_banner_accent_color" format="color" />
     <color name="riotx_keys_backup_banner_accent_color_light">#FFF8E3</color>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index be7602af51..a3c69a772c 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -154,7 +154,7 @@
     <string name="user_directory_header">User directory</string>
     <string name="matrix_only_filter">Matrix contacts only</string>
     <string name="no_conversation_placeholder">No conversations</string>
-    <string name="no_contact_access_placeholder">You didn’t allow Riot to access your local contacts</string>
+    <string name="no_contact_access_placeholder">You didn’t allow Element to access your local contacts</string>
     <string name="no_result_placeholder">No results</string>
     <string name="people_no_identity_server">No identity server configured.</string>
 
@@ -215,7 +215,7 @@
     <string name="call_failed_no_ice_use_alt">Try using %s</string>
     <string name="call_failed_dont_ask_again">Do not ask me again</string>
 
-    <string name="call_failed_no_connection">RiotX Call Failed</string>
+    <string name="call_failed_no_connection">Element Call Failed</string>
     <string name="call_failed_no_connection_description">Failed to establish real time connection.\nPlease ask the administrator of your homeserver to configure a TURN server in order for calls to work reliably.</string>
 
     <string name="call_select_sound_device">Select Sound Device</string>
@@ -326,7 +326,7 @@
     <string name="e2e_re_request_encryption_key_sent">Key request sent.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Request sent</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Please launch Riot on another device that can decrypt the message so it can send the keys to this session.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Please launch Element on another device that can decrypt the message so it can send the keys to this session.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Read Receipts List</string>
@@ -365,7 +365,7 @@
 
     <!-- Call settings screen -->
     <string name="settings_call_category">Calls</string>
-    <string name="settings_call_ringtone_use_riot_ringtone">Use default Riot ringtone for incoming calls</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Use default Element ringtone for incoming calls</string>
     <string name="settings_call_ringtone_use_default_stun">Allow fallback call assist server</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Will use "%s" as assist when your home server does not offer one (your IP address will be shared during a call)</string>
     <string name="settings_call_ringtone_title">Incoming call ringtone</string>
@@ -396,14 +396,14 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Riot needs permission to access your photo and video library to send and save attachments.\n\nPlease allow access on the next pop-up to be able to send files from your phone.</string>
-    <string name="permissions_rationale_msg_camera">Riot needs permission to access your camera to take pictures and video calls.</string>
+    <string name="permissions_rationale_msg_storage">Element needs permission to access your photo and video library to send and save attachments.\n\nPlease allow access on the next pop-up to be able to send files from your phone.</string>
+    <string name="permissions_rationale_msg_camera">Element needs permission to access your camera to take pictures and video calls.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nPlease allow access on the next pop-up to be able to make the call.</string>
-    <string name="permissions_rationale_msg_record_audio">Riot needs permission to access your microphone to perform audio calls.</string>
+    <string name="permissions_rationale_msg_record_audio">Element needs permission to access your microphone to perform audio calls.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nPlease allow access on the next pop-up to be able to make the call.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
-    <string name="permissions_rationale_msg_contacts">Riot can check your address book to find other Matrix users based on their email and phone numbers. If you agree to share your address book for this purpose, please allow access on the next pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot can check your address book to find other Matrix users based on their email and phone numbers.\n\nDo you agree to share your address book for this purpose?</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Element needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
+    <string name="permissions_rationale_msg_contacts">Element can check your address book to find other Matrix users based on their email and phone numbers. If you agree to share your address book for this purpose, please allow access on the next pop-up.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Element can check your address book to find other Matrix users based on their email and phone numbers.\n\nDo you agree to share your address book for this purpose?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Sorry. Action not performed, due to missing permissions</string>
 
@@ -671,7 +671,7 @@
     <string name="settings_app_info_link_title">Application info</string>
     <string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
     <string name="settings_add_3pid_confirm_password_title">Confirm your password</string>
-    <string name="settings_add_3pid_flow_not_supported">You can\'t do this from Riot mobile</string>
+    <string name="settings_add_3pid_flow_not_supported">You can\'t do this from Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">Authentication is required</string>
 
 
@@ -700,7 +700,7 @@
 
     <string name="settings_troubleshoot_test_device_settings_title">Session Settings.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notifications are enabled for this session.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Notifications are not enabled for this session.\nPlease check the Riot settings.</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">Notifications are not enabled for this session.\nPlease check the Element settings.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Enable</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Custom Settings.</string>
@@ -711,15 +711,15 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services Check</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK is available and up-to-date.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Riot uses Google Play Services to deliver push messages but it doesn’t seem to be configured correctly:\n%1$s</string>
+    <string name="settings_troubleshoot_test_play_services_failed">Element uses Google Play Services to deliver push messages but it doesn’t seem to be configured correctly:\n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Fix Play Services</string>
 
     <string name="settings_troubleshoot_test_fcm_title">Firebase Token</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM token successfully retrieved:\n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Failed to retrieved FCM token:\n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nThis error is out of control of Riot and according to Google, this error indicates that the device has too many apps registered with FCM. The error only occurs in cases where there are extreme numbers of apps, so it should not affect the average user.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nThis error is out of control of Riot. It can occur for several reasons. Maybe it will work if you retry later, you can also check that Google Play Service is not restricted in data usage in the system settings, or that your device clock is correct, or it can happen on custom ROM.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nThis error is out of control of Riot. There is no Google account on the phone. Please open the account manager and add a Google account.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nThis error is out of control of Element and according to Google, this error indicates that the device has too many apps registered with FCM. The error only occurs in cases where there are extreme numbers of apps, so it should not affect the average user.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nThis error is out of control of Element. It can occur for several reasons. Maybe it will work if you retry later, you can also check that Google Play Service is not restricted in data usage in the system settings, or that your device clock is correct, or it can happen on custom ROM.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nThis error is out of control of Element. There is no Google account on the phone. Please open the account manager and add a Google account.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Add Account</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Token Registration</string>
@@ -737,16 +737,16 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Start on boot</string>
     <string name="settings_troubleshoot_test_service_boot_success">Service will start when the device is restarted.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">The service will not start when the device is restarted, you will not receive notifications until Riot has been opened once.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">The service will not start when the device is restarted, you will not receive notifications until Element has been opened once.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Enable Start on boot</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Check background restrictions</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Background restrictions are disabled for Riot. This test should be run using mobile data (no WIFI).\n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Background restrictions are enabled for Riot.\nWork that the app tries to do will be aggressively restricted while it is in the background, and this could affect notifications.\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Background restrictions are disabled for Element. This test should be run using mobile data (no WIFI).\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Background restrictions are enabled for Element.\nWork that the app tries to do will be aggressively restricted while it is in the background, and this could affect notifications.\n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Disable restrictions</string>
 
     <string name="settings_troubleshoot_test_battery_title">Battery Optimization</string>
-    <string name="settings_troubleshoot_test_battery_success">Riot is not affected by Battery Optimization.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element is not affected by Battery Optimization.</string>
     <string name="settings_troubleshoot_test_battery_failed">If a user leaves a device unplugged and stationary for a period of time, with the screen off, the device enters Doze mode. This prevents apps from accessing the network and defers their jobs, syncs, and standard alarms. </string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignore Optimization</string>
 
@@ -781,9 +781,9 @@
     <string name="settings_background_sync">Background synchronization</string>
     <string name="settings_background_fdroid_sync_mode">Background Sync Mode (Experimental)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimized for battery</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Riot will sync in background in way that preserves the device’s limited resources (battery).\nDepending on your device resource state, the sync may be deferred by the operating system.</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element will sync in background in way that preserves the device’s limited resources (battery).\nDepending on your device resource state, the sync may be deferred by the operating system.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimized for real time</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Riot will sync in background periodically at precise time (configurable).\nThis will impact radio and battery usage, there will be a permanent notification displayed stating that riot is listening for events.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element will sync in background periodically at precise time (configurable).\nThis will impact radio and battery usage, there will be a permanent notification displayed stating that Element is listening for events.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">No background sync</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">You will not be notified of incoming messages when the app is in background.</string>
     <string name="settings_background_sync_update_error">Failed to update settings.</string>
@@ -858,19 +858,19 @@
     <string name="settings_discovery_category">Discovery</string>
     <string name="settings_discovery_manage">Manage your discovery settings.</string>
     <string name="startup_notification_privacy_title">Notification Privacy</string>
-    <string name="startup_notification_privacy_message">Riot can run in the background to manage your notifications securely and privately. This might affect battery usage.</string>
+    <string name="startup_notification_privacy_message">Element can run in the background to manage your notifications securely and privately. This might affect battery usage.</string>
     <string name="startup_notification_privacy_button_grant">Grant permission</string>
     <string name="startup_notification_privacy_button_other">Choose another option</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Background Connection</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Riot needs to keep a low impact background connection in order to have reliable notifications.\nOn the next screen you will be prompted to allow Riot to always run in background, please accept.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Element needs to keep a low impact background connection in order to have reliable notifications.\nOn the next screen you will be prompted to allow Element to always run in background, please accept.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Grant permission</string>
 
     <!-- analytics -->
     <string name="settings_analytics">Analytics</string>
     <string name="settings_opt_in_of_analytics">Send analytics data</string>
-    <string name="settings_opt_in_of_analytics_summary">Riot collects anonymous analytics to allow us to improve the application.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Please enable analytics to help us improve Riot.</string>
+    <string name="settings_opt_in_of_analytics_summary">Element collects anonymous analytics to allow us to improve the application.</string>
+    <string name="settings_opt_in_of_analytics_prompt">Please enable analytics to help us improve Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Yes, I want to help!</string>
 
     <string name="settings_data_save_mode">Data save mode</string>
@@ -1094,7 +1094,7 @@
     <string name="encryption_information_verify_device_warning2">"If they don't match, the security of your communication may be compromised."</string>
     <string name="encryption_information_verify_key_match">I verify that the keys match</string>
 
-    <string name="e2e_enabling_on_app_update">Riot now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings.</string>
+    <string name="e2e_enabling_on_app_update">Element now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings.</string>
 
     <!-- unknown sessions management -->
     <string name="unknown_devices_alert_title">Room contains unknown sessions</string>
@@ -1368,20 +1368,20 @@
     <string name="no_valid_google_play_services_apk">No valid Google Play Services APK found. Notifications may not work properly.</string>
 
     <!-- String for Play Store -->
-    <string name="store_title">Riot.im - Communicate, your way</string>
-    <string name="store_whats_new">"We’re always making changes and improvements to Riot.im.
+    <string name="store_title">Element - Communicate, your way</string>
+    <string name="store_whats_new">"We’re always making changes and improvements to Element.
 The complete changelog can be found here: %1$s.
 To make sure you don’t miss a thing, just keep your updates turned on."</string>
     <string name="store_short_description">A universal secure chat app entirely under your control.</string>
-    <string name="store_full_description">"A chat app, under your control and entirely flexible. Riot lets you communicate the way you want. Made for [matrix] - the standard for open, decentralised communication.
+    <string name="store_full_description">"A chat app, under your control and entirely flexible. Element lets you communicate the way you want. Made for [matrix] - the standard for open, decentralised communication.
 
 Get a free matrix.org account, get your own server at https://modular.im, or use another Matrix server.
 
-Why choose Riot.im?
+Why choose Element?
 
 • COMPLETE COMMUNICATION: Build rooms around your teams, your friends, your community - however you like! Chat, share files, add widgets and make voice and video calls - all free of charge.
 
-• POWERFUL INTEGRATIONS: Use Riot.im with the tools you know and love. With Riot.im you can even chat with users and groups on other chat apps.
+• POWERFUL INTEGRATIONS: Use Element with the tools you know and love. With Element you can even chat with users and groups on other chat apps.
 
 • PRIVATE AND SECURE: Keep your conversations secret. State of the art end-to-end encryption ensures that private communication stays private.
 
@@ -1399,7 +1399,7 @@ Why choose Riot.im?
 
     <!-- Key Backup -->
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Please delete the passphrase if you want Riot to generate a recovery key.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Please delete the passphrase if you want Element to generate a recovery key.</string>
     <string name="keys_backup_no_session_error">No Matrix session available</string>
 
     <string name="keys_backup_setup_step1_title">Never lose encrypted messages</string>
@@ -1542,7 +1542,7 @@ Why choose Riot.im?
 
     <string name="autodiscover_invalid_response">Invalid homeserver discovery response</string>
     <string name="autodiscover_well_known_autofill_dialog_title">"Autocomplete Server Options</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Riot detected a custom server configuration for your userId domain \"%1$s\":\n%2$s</string>
+    <string name="autodiscover_well_known_autofill_dialog_message">Element detected a custom server configuration for your userId domain \"%1$s\":\n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Use Config</string>
 
     <string name="invalid_or_expired_credentials">You have been logged out due to invalid or expired credentials.</string>
@@ -1595,7 +1595,7 @@ Why choose Riot.im?
     <string name="identity_server_not_defined">You are not using any Identity Server</string>
     <string name="identity_server_not_defined_for_password_reset">No identity server is configured, it is required to reset your password.</string>
 
-    <string name="security_warning_identity_server">"Previous versions of Riot had a security bug which could give your Identity Server (%1$s) access to your account. If you trust %2$s, you can ignore this; otherwise please logout and login again.\n\nRead more details here:\nhttps://medium.com/@RiotChat/36b4792ea0d6"</string>
+    <string name="security_warning_identity_server">"Previous versions of Element had a security bug which could give your Identity Server (%1$s) access to your account. If you trust %2$s, you can ignore this; otherwise please logout and login again.\n\nRead more details here:\nhttps://medium.com/@RiotChat/36b4792ea0d6"</string>
 
     <string name="error_user_already_logged_in">It looks like you’re trying to connect to another homeserver. Do you want to sign out?</string>
 
@@ -1641,7 +1641,7 @@ Why choose Riot.im?
     <string name="group_all_communities">"All Communities"</string>
 
     <string name="room_preview_no_preview">"This room can't be previewed"</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">"The preview of world-readable room is not supported yet in RiotX"</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">"The preview of world-readable room is not supported yet in Element"</string>
 
     <string name="fab_menu_create_room">"Rooms"</string>
     <string name="fab_menu_create_chat">"Direct Messages"</string>
@@ -1659,7 +1659,7 @@ Why choose Riot.im?
     <string name="keys_backup_unable_to_get_keys_backup_data">"An error occurred getting keys backup data"</string>
 
     <string name="alpha_disclaimer_title">Welcome to the beta!</string>
-    <string name="alpha_disclaimer_content_line_1">"While RiotX is in early development, some features may be missing and you may experience bugs."</string>
+    <string name="alpha_disclaimer_content_line_1">"While Element is in early development, some features may be missing and you may experience bugs."</string>
     <!-- The parameter will be replaced by the value of string alpha_disclaimer_content_line_2_gplay_colored_part -->
     <string name="alpha_disclaimer_content_line_2_gplay">"The latest feature list is always in the %1$s, and if you find bugs please submit a report in the top left menu of Home, and we’ll fix them as quickly as we can."</string>
     <string name="alpha_disclaimer_content_line_2_gplay_colored_part">"Play Store description"</string>
@@ -1704,13 +1704,13 @@ Why choose Riot.im?
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
 
     <!-- String for Play Store, for RiotX -->
-    <string name="store_riotx_title">RiotX - Next Generation Matrix Client</string>
+    <string name="store_riotx_title">Element - Next Generation Matrix Client</string>
     <string name="store_riotx_short_description">A faster and lighter client for Matrix using the latest Android frameworks</string>
-    <string name="store_riotx_full_description">"RiotX is a new client for the Matrix protocol (Matrix.org): an open network for secure, decentralised communication. RiotX is a full rewrite of the Riot Android client, based on a full rewrite of the Matrix Android SDK.
+    <string name="store_riotx_full_description">"Element is a new client for the Matrix protocol (Matrix.org): an open network for secure, decentralised communication. Element is a full rewrite of the Riot Android client, based on a full rewrite of the Matrix Android SDK.
 
-Disclaimer: This is a beta version. RiotX is currently in active development and contains limitations and (we hope not too many) bugs. All feedback is welcome!
+Disclaimer: This is a beta version. Element is currently in active development and contains limitations and (we hope not too many) bugs. All feedback is welcome!
 
-RiotX supports:
+Element supports:
 • Login to an existing account
 • Create room and join public rooms
 • Accept and reject invitations
@@ -1723,7 +1723,7 @@ RiotX supports:
 • Push notification
 • Light, Dark and Black themes
 
-Not all features in Riot are implemented in RiotX yet. Main missing (and coming soon!) features:
+Not all features in Riot are implemented in Element yet. Main missing (and coming soon!) features:
 • Room settings (list room members, etc.)
 • Calls
 • Widgets
@@ -1873,7 +1873,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="content_reported_as_inappropriate_title">"Reported as inappropriate"</string>
     <string name="content_reported_as_inappropriate_content">"This content was reported as inappropriate.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Riot needs permission to save your E2E keys on disk.\n\nPlease allow access on the next pop-up to be able to export your keys manually.</string>
+    <string name="permissions_rationale_msg_keys_backup_export">Element needs permission to save your E2E keys on disk.\n\nPlease allow access on the next pop-up to be able to export your keys manually.</string>
 
     <string name="no_network_indicator">There is no network connection right now</string>
 
@@ -1904,7 +1904,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="room_join_rules_invite_by_you">You made the room invite only.</string>
     <string name="timeline_unread_messages">Unread messages</string>
 
-    <string name="login_splash_title">Liberate your communication</string>
+    <string name="login_splash_title">It\'s your conversation. Own it.</string>
     <string name="login_splash_text1">Chat with people directly or in groups</string>
     <string name="login_splash_text2">Keep conversations private with encryption</string>
     <string name="login_splash_text3">Extend &amp; customise your experience</string>
@@ -1921,7 +1921,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="login_continue">Continue</string>
     <!-- Replaced string is the homeserver url -->
     <string name="login_connect_to">Connect to %1$s</string>
-    <string name="login_connect_to_modular">Connect to Modular</string>
+    <string name="login_connect_to_modular">Connect to Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Connect to a custom server</string>
     <!-- Replaced string is the homeserver url -->
     <string name="login_signin_to">Sign in to %1$s</string>
@@ -1929,11 +1929,12 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="login_signin">Sign In</string>
     <string name="login_signin_sso">Continue with SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Modular Address</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Address</string>
     <string name="login_server_url_form_other_hint">Address</string>
     <string name="login_server_url_form_modular_text">Premium hosting for organisations</string>
-    <string name="login_server_url_form_modular_notice">Enter the address of the Modular Riot or Server you want to use</string>
-    <string name="login_server_url_form_other_notice">Enter the address of a server or a Riot you want to connect to</string>
+    <string name="login_server_url_form_modular_notice">Enter the address of the Modular Element or Server you want to use</string>
+    <string name="login_server_url_form_other_notice">Enter the address of a server or a Element you want to connect to</string>
+    <string name="login_server_url_form_common_notice">Enter the address of the server you want to use</string>
 
     <string name="login_sso_error_message">An error occurred when loading the page: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">The application is not able to signin to this homeserver. The homeserver supports the following signin type(s): %1$s.\n\nDo you want to signin using a web client?</string>
@@ -2003,7 +2004,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="login_signup_cancel_confirmation_content">Your account is not created yet.\n\nStop the registration process?</string>
 
     <string name="login_a11y_choose_matrix_org">Select matrix.org</string>
-    <string name="login_a11y_choose_modular">Select modular</string>
+    <string name="login_a11y_choose_modular">Select Element Matrix Services</string>
     <string name="login_a11y_choose_other">Select a custom homeserver</string>
     <string name="login_a11y_captcha_container">Please perform the captcha challenge</string>
     <string name="login_terms_title">Accept terms to continue</string>
@@ -2049,7 +2050,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="soft_logout_clear_data_dialog_content">Clear all data currently stored on this device?\nSign in again to access your account data and messages.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">You’ll lose access to secure messages unless you sign in to recover your encryption keys.</string>
     <string name="soft_logout_clear_data_dialog_submit">Clear data</string>
-    <string name="soft_logout_sso_not_same_user_error">The current session is for user %1$s and you provide credentials for user %2$s. This is not supported by RiotX.\nPlease first clear data, then sign in again on another account.</string>
+    <string name="soft_logout_sso_not_same_user_error">The current session is for user %1$s and you provide credentials for user %2$s. This is not supported by Element.\nPlease first clear data, then sign in again on another account.</string>
 
     <string name="permalink_malformed">Your matrix.to link was malformed</string>
     <string name="bug_report_error_too_short">The description is too short</string>
@@ -2071,7 +2072,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="autocomplete_limited_results">Showing only the first results, type more letters…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
-    <string name="settings_developer_mode_fail_fast_summary">RiotX may crash more often when an unexpected error occurs</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element may crash more often when an unexpected error occurs</string>
 
     <string name="command_description_verify">Request to verify the given userID</string>
     <string name="command_description_shrug">Prepends ¯\\_(ツ)_/¯ to a plain-text message</string>
@@ -2156,9 +2157,9 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="room_member_jump_to_read_receipt">Jump to read receipt</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">"RiotX does not handle events of type '%1$s'"</string>
-    <string name="rendering_event_error_type_of_message_not_handled">"RiotX does not handle message of type '%1$s'"</string>
-    <string name="rendering_event_error_exception">"RiotX encountered an issue when rendering content of event with id '%1$s'"</string>
+    <string name="rendering_event_error_type_of_event_not_handled">"Element does not handle events of type '%1$s'"</string>
+    <string name="rendering_event_error_type_of_message_not_handled">"Element does not handle message of type '%1$s'"</string>
+    <string name="rendering_event_error_exception">"Element encountered an issue when rendering content of event with id '%1$s'"</string>
 
     <string name="unignore">Unignore</string>
 
@@ -2286,7 +2287,7 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Keys are already up to date!</string>
 
-    <string name="login_mobile_device_riotx">RiotX Android</string>
+    <string name="login_mobile_device_riotx">Element Android</string>
 
     <string name="settings_key_requests">Key Requests</string>
 
@@ -2433,11 +2434,11 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="error_saving_media_file">Could not save media file</string>
     <string name="change_password_summary">Set a new account password…</string>
 
-    <string name="use_other_session_content_description">Use the latest Riot on your other devices, Riot Web, Riot Desktop, Riot iOS, RiotX for Android, or another cross-signing capable Matrix client</string>
-    <string name="riot_desktop_web">Riot Web\nRiot Desktop</string>
-    <string name="riot_ios_android">Riot iOS\nRiot X for Android</string>
+    <string name="use_other_session_content_description">Use the latest Element on your other devices, Element Web, Element Desktop, Element iOS, Element for Android, or another cross-signing capable Matrix client</string>
+    <string name="riot_desktop_web">Element Web\nElement Desktop</string>
+    <string name="riot_ios_android">Element iOS\nElement for Android</string>
     <string name="or_other_mx_capabale_client">or another cross-signing capable Matrix client</string>
-    <string name="use_latest_riot">Use the latest Riot on your other devices:</string>
+    <string name="use_latest_riot">Use the latest Element on your other devices:</string>
     <string name="command_description_discard_session">Forces the current outbound group session in an encrypted room to be discarded</string>
     <string name="command_description_discard_session_not_handled">Only supported in encrypted rooms</string>
     <!-- first will be replaced by recovery_passphrase, second will be replaced by recovery_key-->
@@ -2485,11 +2486,11 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="open_terms_of">Open terms of %s</string>
     <string name="disconnect_identity_server_dialog_content">Disconnect from the identity server %s?</string>
-    <string name="identity_server_error_outdated_identity_server">This identity server is outdated. RiotX support only API V2.</string>
+    <string name="identity_server_error_outdated_identity_server">This identity server is outdated. Element support only API V2.</string>
     <string name="identity_server_error_outdated_home_server">This operation is not possible. The homeserver is outdated.</string>
     <string name="identity_server_error_no_identity_server_configured">Please first configure an identity server.</string>
     <string name="identity_server_error_terms_not_signed">Please first accepts the terms of the identity server in the settings.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, RiotX only supports sending hashed user emails and phone number.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, Element only supports sending hashed user emails and phone number.</string>
     <string name="identity_server_error_binding_error">The association has failed.</string>
     <string name="identity_server_error_no_current_binding_error">The is no current association with this identifier.</string>
 
@@ -2540,6 +2541,14 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
     <string name="crypto_error_withheld_generic">You cannot access this message because the sender purposely did not send the keys</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Waiting for encryption history</string>
 
+    <string name="element_disclaimer_title">Riot is now Element!</string>
+    <string name="element_disclaimer_content">We’re excited to announce we’ve changed name! Your app is up to date and you’re signed in to your account.</string>
+    <string name="element_disclaimer_negative_button">GOT IT</string>
+    <string name="element_disclaimer_positive_button">LEARN MORE</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
     <string name="save_recovery_key_chooser_hint">Save recovery key in</string>
 
     <string name="add_from_phone_book">Add from my phone book</string>
diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml
index 3bcda048dc..f1f067f623 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/vector/src/main/res/values/styles_login.xml
@@ -16,7 +16,7 @@
         <item name="android:id">@id/loginLogo</item>
         <item name="android:layout_width">60dp</item>
         <item name="android:layout_height">60dp</item>
-        <item name="android:src">@drawable/riotx_logo</item>
+        <item name="android:src">@drawable/element_logo_green</item>
         <item name="android:importantForAccessibility">no</item>
         <item name="layout_constraintTop_toTopOf">parent</item>
         <item name="layout_constraintStart_toStartOf">parent</item>
@@ -26,7 +26,7 @@
 
     <style name="LoginLogo" parent="LoginLogo.v21">
         <item name="layout_constraintEnd_toEndOf">parent</item>
-        <item name="android:layout_marginTop">32dp</item>
+        <item name="android:layout_marginTop">48dp</item>
     </style>
 
     <style name="LoginFormContainer">
@@ -51,6 +51,8 @@
     <style name="LoginFormScrollView" parent="LoginFormScrollViewBase">
         <item name="layout_constraintTop_toBottomOf">@id/loginLogo</item>
         <item name="layout_constraintStart_toStartOf">parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_marginTop">24dp</item>
     </style>
 
     <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 64da6ee48c..d36575df1f 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -202,7 +202,7 @@
 
     <style name="VectorSearchView" parent="Widget.AppCompat.SearchView">
         <item name="searchIcon">@drawable/ic_search</item>
-        <item name="closeIcon">@drawable/ic_x_green</item>
+        <item name="closeIcon">@drawable/ic_x_gray</item>
         <item name="iconifiedByDefault">false</item>
     </style>
 
diff --git a/vector/src/main/res/values/text_appearances.xml b/vector/src/main/res/values/text_appearances.xml
index c43cb7e69e..a868942663 100644
--- a/vector/src/main/res/values/text_appearances.xml
+++ b/vector/src/main/res/values/text_appearances.xml
@@ -52,7 +52,7 @@
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColor">?vctr_notice_secondary</item>
+        <item name="android:textColor">?riotx_text_secondary</item>
     </style>
 
     <style name="TextAppearance.Vector.Login.Text.Small">
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 33f04771c1..0c78469c3d 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -36,6 +36,8 @@
         <item name="riotx_room_active_widgets_banner_bg">@color/riotx_room_active_widgets_banner_bg_black</item>
         <item name="riotx_room_active_widgets_banner_text">@color/riotx_room_active_widgets_banner_text_black</item>
 
+        <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_black</item>
+
         <!-- Drawables -->
         <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_black</item>
 
@@ -54,6 +56,8 @@
         <item name="android:colorBackground">?riotx_background</item>
         <item name="colorOnBackground">?riotx_text_primary</item>
 
+        <item name="riotx_bottom_sheet_background">@color/riotx_bottom_sheet_background_black</item>
+
         <!-- Keep color accent for legacy widget-->
         <item name="colorAccent">@color/riotx_accent</item>
 
@@ -74,7 +78,7 @@
         <!--Header/Panel Text Secondary-->
         <item name="vctr_tab_home_secondary">@color/primary_color_dark_black</item>
 
-        <item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_black</item>
+        <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_black</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_black</item>
 
         <item name="vctr_redacted_message_color">@color/list_divider_color_black</item>
@@ -85,8 +89,8 @@
 
         <!-- activities background -->
         <item name="android:windowBackground">@color/riot_primary_background_color_black</item>
-        <item name="vctr_bottom_nav_background_color">@color/primary_color_black</item>
-        <item name="vctr_bottom_nav_background_border_color">#FF15171b</item>
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_black</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_black</item>
 
         <item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_black</item>
     </style>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index b4002b409c..fae33cf6bf 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -34,6 +34,8 @@
         <item name="riotx_room_active_widgets_banner_bg">@color/riotx_room_active_widgets_banner_bg_dark</item>
         <item name="riotx_room_active_widgets_banner_text">@color/riotx_room_active_widgets_banner_text_dark</item>
 
+        <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_dark</item>
+
         <item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>
 
         <!-- Drawables -->
@@ -54,6 +56,8 @@
         <item name="android:colorBackground">?riotx_background</item>
         <item name="colorOnBackground">?riotx_text_primary</item>
 
+        <item name="riotx_bottom_sheet_background">@color/riotx_bottom_sheet_background_dark</item>
+
         <!-- Keep color accent for legacy widget-->
         <item name="colorAccent">@color/riotx_accent</item>
 
@@ -67,11 +71,11 @@
         <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- default background color -->
-        <item name="vctr_bottom_nav_background_color">@color/primary_color_dark</item>
-        <item name="vctr_bottom_nav_background_border_color">#FF15171b</item>
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_dark</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_dark</item>
 
         <!-- waiting view background -->
-        <item name="vctr_waiting_background_color">#55555555</item>
+        <item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_dark</item>
 
 
         <!-- application bar text color -->
@@ -122,7 +126,7 @@
         <!--Header/Panel Text Secondary-->
         <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
-        <item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_dark</item>
+        <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
 
         <item name="vctr_redacted_message_color">@color/list_divider_color_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 3d6a338321..28b29094e5 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -35,6 +35,8 @@
         <item name="riotx_room_active_widgets_banner_bg">@color/riotx_room_active_widgets_banner_bg_light</item>
         <item name="riotx_room_active_widgets_banner_text">@color/riotx_room_active_widgets_banner_text_light</item>
 
+        <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_light</item>
+
         <!-- Drawables -->
         <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_light</item>
 
@@ -53,6 +55,8 @@
         <item name="android:colorBackground">?riotx_background</item>
         <item name="colorOnBackground">?riotx_text_primary</item>
 
+        <item name="riotx_bottom_sheet_background">@color/riotx_bottom_sheet_background_light</item>
+
         <!-- Keep color accent for legacy widget-->
         <item name="colorAccent">@color/riotx_accent</item>
 
@@ -66,11 +70,11 @@
         <item name="android:actionMenuTextColor">?colorAccent</item>
 
         <!-- default background color -->
-        <item name="vctr_bottom_nav_background_color">#FFF3F8FD</item>
-        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_light</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_light</item>
 
         <!-- waiting view background -->
-        <item name="vctr_waiting_background_color">#AAAAAAAA</item>
+        <item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_light</item>
 
         <!-- application bar text color -->
         <!-- Base Text Primary-->
@@ -122,7 +126,7 @@
         <!--Header/Panel Text Secondary-->
         <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
-        <item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_light</item>
+        <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_light</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>
 
         <item name="vctr_redacted_message_color">@color/list_divider_color_light</item>
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index 7607ce30e9..ed260ccfeb 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -21,12 +21,12 @@
 
         <!-- default background color -->
         <item name="android:colorBackground">@color/riot_primary_background_color_status</item>
-        <item name="vctr_bottom_nav_background_color">@color/riot_primary_background_color_status
+        <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_status
         </item>
-        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
+        <item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_status</item>
 
         <!-- waiting view background -->
-        <item name="vctr_waiting_background_color">#AAAAAAAA</item>
+        <item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_status</item>
 
         <!-- application bar text color -->
         <item name="vctr_toolbar_primary_text_color">#FFFFFFFF</item>
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index b1ab778866..1278dd933f 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -26,22 +26,22 @@
 
         <!-- Note: inputType does not work, it is set also in code, as well as iconTint -->
         <im.vector.riotx.core.preference.VectorEditTextPreference
-            android:icon="@drawable/ic_add_black"
+            android:icon="@drawable/ic_material_add"
             android:inputType="textEmailAddress"
             android:key="ADD_EMAIL_PREFERENCE_KEY"
             android:order="100"
             android:title="@string/settings_add_email_address"
-            app:iconTint="?attr/vctr_settings_icon_tint_color" />
+            app:iconTint="@color/riotx_accent" />
 
         <!-- Phone will be added here -->
 
         <!-- Note: iconTint does not work, it is also done in code -->
         <im.vector.riotx.core.preference.VectorPreference
-            android:icon="@drawable/ic_add_black"
+            android:icon="@drawable/ic_material_add"
             android:key="ADD_PHONE_NUMBER_PREFERENCE_KEY"
             android:order="200"
             android:title="@string/settings_add_phone_number"
-            app:iconTint="?attr/vctr_settings_icon_tint_color" />
+            app:iconTint="@color/riotx_accent" />
 
         <im.vector.riotx.core.preference.VectorPreference
             android:order="1000"
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 3be8b53adc..79708a2735 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -45,7 +45,7 @@
         app:fragment="im.vector.riotx.features.settings.VectorSettingsLabsFragment" />
 
     <im.vector.riotx.core.preference.VectorPreference
-        android:icon="@drawable/ic_settings_root_general"
+        android:icon="@drawable/ic_settings_root_advanced"
         android:title="@string/settings_advanced_settings"
         app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedSettingsFragment" />