diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index 5d3a6aab49..5b98111645 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -86,7 +86,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment<F
                 views.loginServerUrlFormText.text = getString(R.string.login_server_url_form_modular_text)
                 views.loginServerUrlFormLearnMore.isVisible = true
                 views.loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_modular_hint)
-                views.loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
+                views.loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_modular_notice)
             }
             else           -> {
                 views.loginServerUrlFormIcon.isVisible = false
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index aefdc868db..cf51e0546d 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -2146,7 +2146,6 @@
     <string name="external_link_confirmation_title">Проверете тази връзка отново</string>
     <string name="error_empty_field_choose_password">Изберете парола.</string>
     <string name="error_empty_field_choose_user_name">Изберете потребителско име.</string>
-    <string name="error_sso_flow_not_supported_yet">Извинявайте, тази операция все още не е възможна за профили свързани чрез Single-Sign-On.</string>
     <string name="mark_as_verified">Маркирай като доверен</string>
     <string name="confirm_your_identity_quad_s">Потвърдете самоличността си потвърждавайки този вход, давайки му достъп до шифрованите съобщения.</string>
     <string name="confirm_your_identity">Потвърдете самоличността си потвърждавайки този вход от някоя от другите ви сесии, давайки му достъп до шифрованите съобщения.</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 95233b9aea..53946bf359 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1539,7 +1539,6 @@
     <string name="settings_expert">Expert</string>
     <string name="room_participants_kick_reason">Motiu de l\'expulsió</string>
     <string name="room_participants_kick_title">Expulsa usuari</string>
-    <string name="error_sso_flow_not_supported_yet">Aquesta operació encara no està disponible en comptes que utilitzen la inscripció única (SSO).</string>
     <string name="login_signin_sso">Continua amb SSO</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, ${app_name} només admet l\'enviament del \"hash\" de correus electrònics i números de telèfon.</string>
     <string name="command_description_discard_session_not_handled">Només admès en sales xifrades</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index ce53fb3617..675ffb25b8 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2336,7 +2336,6 @@
     <string name="setup_cross_signing">Zapnout křížový podpis</string>
     <string name="error_saving_media_file">Uložit mediální soubor se nezdařilo</string>
     <string name="confirm_your_identity_quad_s">Potvrďte svou identitu ověřením tohoto přihlášení, udělujíce přístup k šifrovaným zprávám.</string>
-    <string name="error_sso_flow_not_supported_yet">Je nám líto, tato operace zatím není možná s účty připojenými pomocí Single Sign-On.</string>
     <string name="power_level_edit_title">Nastavit roli</string>
     <string name="power_level_title">Role</string>
     <string name="a11y_open_chat">Otevřít chat</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index e8a3dad24a..46126c6ff9 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2424,7 +2424,6 @@
     <string name="settings_text_message_sent_hint">Code</string>
     <string name="login_msisdn_notice">Verwende das internationale Format (Telefonnummer muss mit \'+\' beginnen)</string>
     <string name="confirm_your_identity_quad_s">Bestätige deine Identität, indem du dieses Login verifizierst, um Zugriff auf verschlüsselte Nachrichten zu erhalten.</string>
-    <string name="error_sso_flow_not_supported_yet">Leider ist dieser Vorgang für Konten, die über Single Sign-On verbunden sind, noch nicht möglich.</string>
     <string name="error_opening_banned_room">Raum, indem du gebannt wurdest, kann nicht geöffnet werden.</string>
     <string name="room_error_not_found">Raum kann nicht gefunden werden. Stelle sicher, dass er existiert.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index a872468f42..747511f745 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2120,7 +2120,6 @@
     <string name="inviting_users_to_room">Invitante uzantojn…</string>
     <string name="invite_users_to_room_action_invite">INVITI</string>
     <string name="add_members_to_room">Aldoni ĉambranojn</string>
-    <string name="error_sso_flow_not_supported_yet">Pardonu, ĉi tiu ago ankoraŭ ne eblas por kontoj konektitaj per ununura saluto.</string>
     <string name="confirm_your_identity_quad_s">Konfirmu vian identecon per kontrolo de ĉi tiu saluto, donante al ĝi aliron al ĉifritaj mesaĝoj.</string>
     <string name="verify_this_session">Kontrolu la novan saluton, kiu aliras vian konton: %1$s</string>
     <string name="verify_other_sessions">Rekontrolu ĉiujn viajn salutaĵojn por certigi, ke viaj konto kaj mesaĝoj estas sekuraj</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index ea0f5d74e1..b0357ab34c 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2361,7 +2361,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="confirm_your_identity">Confirme su identidad verificando este inicio de sesión de una de sus otras sesiones, otorgándole acceso a los mensajes encriptados.</string>
     <string name="confirm_your_identity_quad_s">Confirme su identidad verificando este inicio de sesión, otorgándole acceso a los mensajes encriptados.</string>
     <string name="mark_as_verified">Marcar como de confianza</string>
-    <string name="error_sso_flow_not_supported_yet">Lo sentimos, esta operación aún no es posible para las cuentas conectadas mediante el inicio de sesión único.</string>
     <string name="create_room_dm_failure">No pudimos crear tu DM. Marque los usuarios que desea invitar y vuelva a intentarlo.</string>
     <string name="identity_server_error_terms_not_signed">Primero acepta los términos del servidor de identidad en la configuración.</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">Para su privacidad, ${app_name} solo admite el envío de números de teléfono y correos electrónicos de usuario con hash.</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 3570b18368..4a168a3088 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2361,7 +2361,6 @@
 \n
 \nParima turvalisuse nimel kohtuge silmast silma.</string>
     <string name="confirm_your_identity_quad_s">Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni. Sellega tagad ligipääsu krüptitud sõnumitele.</string>
-    <string name="error_sso_flow_not_supported_yet">Vabandust, selline tegevus pole veel võimalik kasutajakontode puhul, kus kasutatakse ühekordset sisselogimist.</string>
     <string name="error_opening_banned_room">Ei ole võimalik avada sellise jututoa vaadet, kus sulle on seatud suhtluskeeld.</string>
     <string name="room_error_not_found">Ei leia sellist jututuba. Palun kontrolli, et ta ikka olemas on.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 98775c2481..2a9fe70d8b 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1613,7 +1613,6 @@
     <string name="cross_signing_verify_by_emoji">تأیید برهم‌کنشی با اموجی</string>
     <string name="crosssigning_verify_session">تأیید ورود</string>
     <string name="unencrypted">رمزنشده</string>
-    <string name="error_sso_flow_not_supported_yet">متأسّفانه این عملیات هنوز برای حساب‌هایی که با استفاده از ورود یکپارچه وصل شده‌اند، ممکن نیست.</string>
     <string name="mark_as_verified">نشانه‌گذاری به عنوان مطمئن</string>
     <string name="identity_server_set_default_submit">استفاده از %1$s</string>
     <string name="a11y_unmute_microphone">ناخموش کردن میکروفون</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index caba64816a..8011534b00 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2193,7 +2193,6 @@
     <string name="bottom_sheet_setup_secure_backup_submit">Configuration</string>
     <string name="a11y_unmute_microphone">Activer le microphone</string>
     <string name="a11y_mute_microphone">Désactiver le microphone</string>
-    <string name="error_sso_flow_not_supported_yet">Désolé, cette opération n\'est pas encore possible pour les comptes connectés en Authentification unique (SSO).</string>
     <string name="confirm_your_identity_quad_s">Confirmez votre identité en vérifiant cet identifiant, lui donnant ainsi accès aux messages chiffrés.</string>
     <string name="setup_cross_signing">Activer la signature croisée</string>
     <plurals name="notification_invitations">
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index c477b5c147..41d6e147c5 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -2362,7 +2362,6 @@
     <string name="external_link_confirmation_title">בדוק-פעמיים קישור זה</string>
     <string name="error_empty_field_choose_password">אנא בחר סיסמה.</string>
     <string name="error_empty_field_choose_user_name">אנא בחר שם משתמש.</string>
-    <string name="error_sso_flow_not_supported_yet">מצטערים, פעולה זו עדיין אינה אפשרית עבור חשבונות המחוברים באמצעות כניסה יחידה.</string>
     <string name="mark_as_verified">סמן כאמין</string>
     <string name="confirm_your_identity_quad_s">אשר את זהותך על ידי אימות התחברות זו והעניק לו גישה להודעות מוצפנות.</string>
     <string name="cross_signing_verify_by_emoji">אימות אינטראקטיבי על ידי Emoji</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 3eaa8bdd51..39ca954053 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2423,7 +2423,6 @@
     <string name="settings_text_message_sent_hint">Codice</string>
     <string name="login_msisdn_notice">Si prega di usare il formato internazionale (il numero deve iniziare con \'+\')</string>
     <string name="confirm_your_identity_quad_s">Conferma la tua identità verificando questo accesso, dandogli l\'accesso ai messaggi cifrati.</string>
-    <string name="error_sso_flow_not_supported_yet">Spiacente, questa operazione non è ancora possibile per gli account connessi tramite Single Sign-On.</string>
     <string name="error_opening_banned_room">Impossibile aprire una stanza dove sei stato bandito.</string>
     <string name="room_error_not_found">Impossibile trovare questa stanza. Assicurati che esista.</string>
     <string name="no_permissions_to_start_webrtc_call">Non hai il permesso di avviare una chiamata in questa stanza</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index c477b5c147..41d6e147c5 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -2362,7 +2362,6 @@
     <string name="external_link_confirmation_title">בדוק-פעמיים קישור זה</string>
     <string name="error_empty_field_choose_password">אנא בחר סיסמה.</string>
     <string name="error_empty_field_choose_user_name">אנא בחר שם משתמש.</string>
-    <string name="error_sso_flow_not_supported_yet">מצטערים, פעולה זו עדיין אינה אפשרית עבור חשבונות המחוברים באמצעות כניסה יחידה.</string>
     <string name="mark_as_verified">סמן כאמין</string>
     <string name="confirm_your_identity_quad_s">אשר את זהותך על ידי אימות התחברות זו והעניק לו גישה להודעות מוצפנות.</string>
     <string name="cross_signing_verify_by_emoji">אימות אינטראקטיבי על ידי Emoji</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 8725bb9f91..516ccc1caf 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -2200,7 +2200,6 @@
     <string name="enter_secret_storage_input_key">Fren tasarut-ik·im n tririt, neɣ err-itt s ufus s tira-ines s uasiw neɣ s usenteḍ-ines seg ɣefafus-inek·inem</string>
     <string name="cross_signing_verify_by_emoji">Senqed amyigew s yimujit</string>
     <string name="confirm_your_identity_quad_s">Sentem timagit-inek·inem s usenqed n yinekcam-a, anef-as ad yekcem ɣer yiznan yettwawgelhen.</string>
-    <string name="error_sso_flow_not_supported_yet">Suref-aɣ, tamahelt-a ulamek i tedda akka tura i yimiḍanen i yettwaqqnen s useqdec n unekcum asuf.</string>
     <string name="external_link_confirmation_title">Senqed tikkelt-nniḍen aseɣwen-a</string>
     <string name="external_link_confirmation_message">Aseɣwen %1$s ad ak·akem-yawi ɣer usmel-nniḍen: %2$s.
 \n
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 02547d02b1..72c7faa1ca 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -2273,7 +2273,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="set_a_security_phrase_hint">Fraza Bezpieczeństwa</string>
     <string name="set_a_security_phrase_title">Ustaw Frazę Bezpieczeństwa</string>
     <string name="error_empty_field_choose_user_name">Wybierz nazwę użytkownika.</string>
-    <string name="error_sso_flow_not_supported_yet">Przepraszamy, ta operacja nie jest jeszcze dostępna dla kont wykorzystujących Single Sign-On.</string>
     <string name="mark_as_verified">Oznacz jako Zaufane</string>
     <string name="confirm_your_identity_quad_s">Potwierdź swoją tożsamość poprzez zweryfikowanie tego logowania aby uzyskać dostęp do zaszyfrowanych wiadomości.</string>
     <string name="confirm_your_identity">Potwierdź swoją tożsamość poprzez zweryfikowanie tego logowania przy pomocy którejś z pozostałych sesji w celu przyznania dostępu do zaszyfrowanych wiadomości.</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index d6745b5e86..d346cbff34 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2447,7 +2447,6 @@
     <string name="delete_account_data_warning">Remover os dados de %1$s desta conta\?
 \n
 \nProssiga com cuidado, pois não há como reverter esta escolha.</string>
-    <string name="error_sso_flow_not_supported_yet">Desculpe, esta funcionalidade ainda não está disponível para contas conectadas via acesso único.</string>
     <string name="template_settings_security_pin_code_grace_period_summary_off">O código PIN é solicitado todas as vezes que você abre o ${app_name}.</string>
     <string name="template_settings_security_pin_code_grace_period_summary_on">O código PIN é solicitado após 2 minutos sem usar o ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Solicitar o PIN depois de 2 minutos</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index e2e81e13f6..e401e856ce 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2498,7 +2498,6 @@
     <string name="settings_text_message_sent_hint">Код</string>
     <string name="login_msisdn_notice">Используйте международный формат (номер телефона должен начинаться с \'+\')</string>
     <string name="confirm_your_identity_quad_s">Подтвердите свою личность, проверив этот логин, предоставив ему доступ к зашифрованным сообщениям.</string>
-    <string name="error_sso_flow_not_supported_yet">К сожалению, эта операция пока недоступна для учетных записей, подключенных с помощью единого входа.</string>
     <string name="error_opening_banned_room">Невозможно открыть комнату, в которую вам запрещён доступ.</string>
     <string name="room_error_not_found">Невозможно найти эту комнату. Убедитесь, что она существует.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 03045e3885..90b0e45a9b 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2293,7 +2293,6 @@
     <string name="auth_invalid_login_deactivated_account">Kjo llogari është çaktivizuar.</string>
     <string name="error_saving_media_file">S’u ruajt dot kartelë media</string>
     <string name="confirm_your_identity_quad_s">Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjeje, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
-    <string name="error_sso_flow_not_supported_yet">Na ndjeni, ky veprim s’është ende i mundshëm për llogari të lidhura duke përdorur Hyrje Njëshe.</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">Për privatësinë tuaj, ${app_name}-i mbulon vetëm dërgim email-esh dhe numrash telefoni përdoruesi të koduar.</string>
     <string name="power_level_edit_title">Caktoni rol</string>
     <string name="power_level_title">Rol</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index a6a6b25e2b..150d4018ff 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2361,7 +2361,6 @@
     <string name="settings_text_message_sent_hint">Kod</string>
     <string name="login_msisdn_notice">Vänligen använd internationellt format (telefonnumret måste börja med \'+\')</string>
     <string name="confirm_your_identity_quad_s">Bekräfta din identitet genom att verifiera den här inloggningen, och ge den åtkomst till dina krypterade meddelanden.</string>
-    <string name="error_sso_flow_not_supported_yet">Tyvärr stöds den här handlingen inte än för konton anslutna med externt konto.</string>
     <string name="error_opening_banned_room">Kan inte öppna ett rum du är bannad från.</string>
     <string name="room_error_not_found">Kan inte hitta det här rummet. Se till att det existerar.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 92f6c849ef..e40e95da82 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2278,7 +2278,6 @@
     <string name="settings_text_message_sent_hint">代码</string>
     <string name="login_msisdn_notice">请使用国际格式（电话号码必须以 ‘+’ 开始）</string>
     <string name="confirm_your_identity_quad_s">通过验证此登录确认您的身份，授权它访问加密信息。</string>
-    <string name="error_sso_flow_not_supported_yet">抱歉，对于连接到单点登录的账户此操作尚不可用。</string>
     <string name="error_opening_banned_room">无法打开您被封禁的聊天室。</string>
     <string name="room_error_not_found">无法找到此聊天室。请确认它存在。</string>
     <string name="no_permissions_to_start_webrtc_call">您没有权限在此聊天室发起通话</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 495e60d33c..842700b6eb 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2316,7 +2316,6 @@
     <string name="settings_text_message_sent_hint">代碼</string>
     <string name="login_msisdn_notice">請使用國際格式（電話號碼必須以 \'+\' 開頭）</string>
     <string name="confirm_your_identity_quad_s">透過確認此登入來驗證您的身份，以及授予存取加密訊息的權限。</string>
-    <string name="error_sso_flow_not_supported_yet">抱歉，對於使用單一登入的帳號，還無法執行此動作。</string>
     <string name="error_opening_banned_room">無法開啟禁止您進入的聊天室。</string>
     <string name="room_error_not_found">找不到此聊天室。請確定它存在。</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values/values.xml b/vector/src/main/res/values/attrs_reaction_button.xml
similarity index 100%
rename from vector/src/main/res/values/values.xml
rename to vector/src/main/res/values/attrs_reaction_button.xml
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index a741997393..4ebd663f9f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2983,7 +2983,6 @@
     <string name="confirm_your_identity_quad_s">Confirm your identity by verifying this login, granting it access to encrypted messages.</string>
     <string name="mark_as_verified">Mark as Trusted</string>
 
-    <string name="error_sso_flow_not_supported_yet">Sorry, this operation is not possible yet for accounts connected using Single Sign-On.</string>
     <string name="failed_to_initialize_cross_signing">Failed to set up Cross Signing</string>
 
     <string name="error_empty_field_choose_user_name">Please choose a username.</string>