diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx
index 5c208d9659..a3b7e27638 100644
--- a/app/containers/TextInput/FormTextInput.tsx
+++ b/app/containers/TextInput/FormTextInput.tsx
@@ -100,7 +100,7 @@ export const FormTextInput = ({
 	return (
 		<View
 			accessible
-			accessibilityLabel={`${label} - ${required ? i18n.t('Required') : ''}`}
+			accessibilityLabel={accessibilityLabel ?? `${label} - ${required ? i18n.t('Required') : ''}`}
 			style={[styles.inputContainer, containerStyle]}>
 			{label ? (
 				<Text style={[styles.label, { color: colors.fontTitlesLabels }, error?.error && { color: colors.fontDanger }]}>
diff --git a/app/containers/TwoFactor/index.tsx b/app/containers/TwoFactor/index.tsx
index dc0dcde1c5..785df41849 100644
--- a/app/containers/TwoFactor/index.tsx
+++ b/app/containers/TwoFactor/index.tsx
@@ -80,7 +80,7 @@ const TwoFactor = React.memo(() => {
 				}
 			}
 		} catch (e) {
-			log(e)
+			log(e);
 		}
 	};
 
@@ -93,7 +93,9 @@ const TwoFactor = React.memo(() => {
 		}
 	}, [data]);
 
-	const showTwoFactor = (args: EventListenerMethod) => setData(args);
+	const showTwoFactor = (args: EventListenerMethod) => {
+		setData(args);
+	};
 
 	useEffect(() => {
 		const listener = EventEmitter.addEventListener(TWO_FACTOR, showTwoFactor);
@@ -123,7 +125,12 @@ const TwoFactor = React.memo(() => {
 
 	const color = colors.fontTitlesLabels;
 	return (
-		<Modal avoidKeyboard useNativeDriver isVisible={visible} hideModalContentWhileAnimating>
+		<Modal
+			customBackdrop={<View aria-hidden style={[styles.overlay, { backgroundColor: colors.overlayBackground }]} />}
+			avoidKeyboard
+			useNativeDriver
+			isVisible={visible}
+			hideModalContentWhileAnimating>
 			<View style={styles.container} testID='two-factor'>
 				<View
 					style={[
@@ -134,17 +141,22 @@ const TwoFactor = React.memo(() => {
 					<Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text>
 					{method?.text ? <Text style={[styles.subtitle, { color }]}>{I18n.t(method.text)}</Text> : null}
 					<FormTextInput
-						value={code}
-						inputRef={(e: any) => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())}
 						returnKeyType='send'
 						autoCapitalize='none'
+						testID='two-factor-input'
+						accessibilityLabel={I18n.t(
+							data?.method === 'password' ? 'Label_Input_Two_Factor_Password' : 'Label_Input_Two_Factor_Code'
+						)}
+						value={code}
+						inputRef={(e: any) => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())}
 						onChangeText={setCode}
 						onSubmitEditing={onSubmit}
 						keyboardType={method?.keyboardType}
 						secureTextEntry={method?.secureTextEntry}
 						error={data.invalid ? { error: 'totp-invalid', reason: I18n.t('Code_or_password_invalid') } : undefined}
-						testID='two-factor-input'
+						containerStyle={styles.containerInput}
 					/>
+
 					{isEmail ? (
 						<Button
 							small
diff --git a/app/containers/TwoFactor/styles.ts b/app/containers/TwoFactor/styles.ts
index 1c5c789cb4..c1a401ad7b 100644
--- a/app/containers/TwoFactor/styles.ts
+++ b/app/containers/TwoFactor/styles.ts
@@ -6,7 +6,7 @@ export default StyleSheet.create({
 	container: {
 		flex: 1,
 		justifyContent: 'center',
-		alignItems: 'center'
+		padding: 16
 	},
 	content: {
 		padding: 16,
@@ -15,13 +15,14 @@ export default StyleSheet.create({
 	},
 	title: {
 		fontSize: 16,
-		paddingBottom: 8,
+		lineHeight: 24,
+		marginBottom: 12,
 		...sharedStyles.textBold,
 		...sharedStyles.textAlignCenter
 	},
 	subtitle: {
 		fontSize: 14,
-		paddingBottom: 8,
+		marginBottom: 12,
 		...sharedStyles.textRegular,
 		...sharedStyles.textAlignCenter
 	},
@@ -37,9 +38,18 @@ export default StyleSheet.create({
 	},
 	buttonContainer: {
 		flexDirection: 'row',
-		justifyContent: 'space-between'
+		justifyContent: 'space-between',
+		marginTop: 36
 	},
 	tablet: {
 		height: undefined
+	},
+	overlay: {
+		flex: 1,
+		alignItems: 'center',
+		justifyContent: 'center'
+	},
+	containerInput: {
+		marginBottom: 0
 	}
 });
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index a1a73b0065..00a341af2b 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -159,7 +159,7 @@
   "Files": "ملفات",
   "Finish_recording": "إنهاء التسجيل",
   "Following_thread": "متابعة الموضوع",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "من أجل حمايتك، يجب عليك إدخال كلمة المرور الحالية للمتابعة",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "لأمانك، يجب عليك إدخال كلمة مرور حسابك للمتابعة.",
   "Forgot_password": "هل نسيت كلمة المرور؟",
   "Forgot_password_If_this_email_is_registered": "إن كان البريد الإلكتروني مسجلاً، فسنرسل تعليمات إعادة تعيين كلمة المرور الخاصة بك. إذا لم تتلق بريداً إلكترونياً قريباً، فيرجى العودة والمحاولة مرة أخرى",
   "Forward": "إعادة توجيه",
@@ -197,6 +197,8 @@
   "Join_the_given_channel": "انضمام إلى القناة المحددة",
   "Just_invited_people_can_access_this_channel": "يمكن للأشخاص المدعوين فقط الوصول إلى هذه القناة",
   "Just_invited_people_can_access_this_team": "فقط الأشخاص المدعوين يمكنهم الوصول إلى هذا الفريق",
+  "Label_Input_Two_Factor_Code": "كود",
+  "Label_Input_Two_Factor_Password": "كلمة المرور",
   "Language": "اللغة",
   "last_message": "الرسالة الأخيرة",
   "Leave": "مغادرة الغرفة",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index fa830f13cb..f12a89f616 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -269,7 +269,7 @@
   "Finish_recording": "রেকর্ডিং শেষ করুন",
   "Following": "অনুসরণ",
   "Following_thread": "থ্রেড অনুসরণ করছেন",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "আপনার নিরাপত্তার জন্য, আপনার বর্তমান পাসওয়ার্ড দিতে হবে যাতে আপনি চালিয়ে যান",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "আপনার নিরাপত্তার জন্য, চালিয়ে যেতে হলে আপনাকে আপনার অ্যাকাউন্টের পাসওয়ার্ড প্রবেশ করতে হবে।",
   "Forgot_password": "আপনার পাসওয়ার্ড ভুলে গিয়েছেন?",
   "Forgot_password_If_this_email_is_registered": "যদি এই ইমেইলটি নিবন্ধিত হয়ে থাকে, আমরা আপনাকে কীভাবে আপনার পাসওয়ার্ড রিসেট করতে হয় তা সম্পর্কে নির্দেশনা প্রেরণ করব। যদি আপনি শীঘ্রই একটি ইমেইল পাননি, তবে অনুগ্রহ করে ফিরে আসুন এবং আবার চেষ্টা করুন।",
   "Forward": "ফরোয়ার্ড",
@@ -316,6 +316,8 @@
   "Joined": "যোগদান করেছে",
   "Just_invited_people_can_access_this_channel": "এই চ্যানেলে শুধুমাত্র আমন্ত্রিত ব্যক্তিদের অ্যাক্সেস করতে পারবে",
   "Just_invited_people_can_access_this_team": "এই দলে শুধুমাত্র আমন্ত্রিত ব্যক্তিদের অ্যাক্সেস করতে পারবে",
+  "Label_Input_Two_Factor_Code": "কোড",
+  "Label_Input_Two_Factor_Password": "পাসওয়ার্ড",
   "Language": "ভাষা",
   "last_message": "শেষ বার্তা",
   "Last_owner_team_room": "আপনি এই চ্যানেলের শেষ মালিক। একবার দল থেকে বের হওয়ার পরে, চ্যানেলটি দলের মধ্যে থাকবে কিন্তু আপনি তাকে বাইরে থেকে পরিচালনা করবেন।",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index 35072e231d..048c17581d 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -288,7 +288,7 @@
   "Finish_recording": "Dokončit nahrávání",
   "Following": "Následující",
   "Following_thread": "Následující vlákno",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Pro vaši bezpečnost musíte pro pokračování zadat své aktuální heslo",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Pro vaši bezpečnost musíte zadat heslo k účtu, abyste mohli pokračovat.",
   "Forgot_password": "Zapomněli jste heslo?",
   "Forgot_password_If_this_email_is_registered": "Pokud je tento e-mail zaregistrován, zašleme Vám pokyny, jak obnovit heslo. Pokud e-mail v nejbližší době neobdržíte, vraťte se a zkuste to znovu.",
   "Forward": "Vpřed",
@@ -346,6 +346,8 @@
   "Jump_to_message": "Přejít na zprávu",
   "Just_invited_people_can_access_this_channel": "K tomuto kanálu mají přístup pouze pozvaní lidé",
   "Just_invited_people_can_access_this_team": "K tomuto týmu mají přístup pouze pozvaní lidé",
+  "Label_Input_Two_Factor_Code": "Kód",
+  "Label_Input_Two_Factor_Password": "Heslo",
   "Language": "Jazyk",
   "last_message": "poslední zpráva",
   "Last_owner_team_room": "Jste posledním vlastníkem tohoto kanálu. Jakmile tým opustíte, kanál zůstane uvnitř týmu, ale budete ho spravovat zvenčí.",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index 14ca44466a..ae953aa96b 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -263,7 +263,7 @@
   "Finish_recording": "Aufnahme neenden",
   "Following": "verfolgte",
   "Following_thread": "Thread folgen",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Zu Ihrer Sicherheit müssen Sie Ihr aktuelles Passwort eingeben, um fortzufahren",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Zu Ihrer Sicherheit müssen Sie Ihr Kontopasswort eingeben, um fortzufahren.",
   "Forgot_password": "Passwort vergessen",
   "Forgot_password_If_this_email_is_registered": "Wenn es sich um eine registrierte E-Mail-Adresse handelt, werden wir an diese eine Anleitung zum Zurücksetzen des Passworts senden. Sollten Sie in Kürzen keine E-Mail erhalten, kommen Sie wieder und versuchen Sie es noch einmal.",
   "Forward": "Weiterleiten",
@@ -309,6 +309,8 @@
   "Joined": "Beigetreten",
   "Just_invited_people_can_access_this_channel": "Nur eingeladene Personen können auf diesen Kanal zugreifen",
   "Just_invited_people_can_access_this_team": "Nur eingeladene Personen können auf das Team zugreifen",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Passwort",
   "Language": "Sprache",
   "last_message": "letzte Nachricht",
   "Last_owner_team_room": "Sie sind der letzte Eigner dieses Channels. Wenn Sie das Team verlassen haben, bleibt der Channel im Team, aber Sie werden ihn von außen verwalten.",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 5714de7813..cbf8d069eb 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -309,7 +309,7 @@
   "Finish_recording": "Finish recording",
   "Following": "Following",
   "Following_thread": "Following thread",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your current password to continue",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your account password to continue.",
   "Forgot_password": "Forgot your password?",
   "Forgot_password_If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.",
   "Forward": "Forward",
@@ -367,6 +367,8 @@
   "Jump_to_message": "Jump to message",
   "Just_invited_people_can_access_this_channel": "Just invited people can access this channel",
   "Just_invited_people_can_access_this_team": "Just invited people can access this team",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Password",
   "Language": "Language",
   "last_message": "last message",
   "Last_owner_team_room": "You are the last owner of this channel. Once you leave the team, the channel will be kept inside the team but you will be managing it from outside.",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index e308d454d3..f470c6d6c5 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -109,7 +109,7 @@
   "Files": "Archivos",
   "Finish_recording": "Finalizar grabación",
   "Following_thread": "Siguiendo hilo",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Por seguridad, debes introducir tu contraseña para continuar",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Por su seguridad, debe ingresar la contraseña de su cuenta para continuar.",
   "Forgot_password": "¿Ha olvidado su contraseña?",
   "Forgot_password_If_this_email_is_registered": "Si este email está registrado, te enviaremos las instrucciones para resetear tu contraseña. Si no recibes un email en breve, vuelve aquí e inténtalo de nuevo.",
   "Full_name": "Nombre completo",
@@ -131,6 +131,8 @@
   "Join": "Conectar",
   "Join_the_given_channel": "Unirse al canal dado",
   "Just_invited_people_can_access_this_channel": "Sólo gente invitada puede acceder a este canal.",
+  "Label_Input_Two_Factor_Code": "Código",
+  "Label_Input_Two_Factor_Password": "Contraseña",
   "Language": "Idioma",
   "last_message": "último mensaje",
   "Learn_more": "Saber más",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 3dd05e43fd..85e55a5b2e 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -248,7 +248,7 @@
   "Finish_recording": "Lopeta tallennus",
   "Following": "Seurataan",
   "Following_thread": "Seurataan ketjua",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Jatka antamalla nykyinen salasanasi turvallisuussyistä",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Turvallisuutesi vuoksi sinun on syötettävä tilisi salasana jatkaaksesi.",
   "Forgot_password": "Unohditko salasanasi?",
   "Forgot_password_If_this_email_is_registered": "Jos tämä sähköpostiosoite on rekisteröity, lähetämme salasanan nollausohjeet. Jos et saa sähköpostia pian, palaa ja yritä uudelleen.",
   "Forward": "Välitä",
@@ -291,6 +291,8 @@
   "Joined": "Liitytty",
   "Just_invited_people_can_access_this_channel": "Vain kutsutut ihmiset voivat käyttää tätä kanavaa",
   "Just_invited_people_can_access_this_team": "Vain kutsutut ihmiset voivat käyttää tätä tiimiä",
+  "Label_Input_Two_Factor_Code": "Koodi",
+  "Label_Input_Two_Factor_Password": "Salasana",
   "Language": "Kieli",
   "last_message": "viimeinen viesti",
   "Last_owner_team_room": "Olet tämän kanavan viimeinen omistaja. Kun lähdet tiimistä, kanava säilyy tiimin sisällä, mutta hallinnoit sitä ulkopuolelta.",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 84dcd18fb9..2371afb8e9 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -212,7 +212,7 @@
   "Finish_recording": "Terminer l'enregistrement",
   "Following": "Suivant",
   "Following_thread": "Suivre le fil",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Pour votre sécurité, vous devez entrer votre mot de passe actuel pour continuer.",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Pour votre sécurité, vous devez entrer le mot de passe de votre compte pour continuer.",
   "Forgot_password": "Mot de passe oublié ?",
   "Forgot_password_If_this_email_is_registered": "Si cet e-mail est enregistré, nous vous enverrons des instructions pour réinitialiser votre mot de passe. Si vous ne recevez pas d'e-mail sous peu, veuillez revenir et réessayer.",
   "Forward": "Transmettre",
@@ -254,6 +254,8 @@
   "Join_the_given_channel": "Rejoindre le canal indiqué",
   "Just_invited_people_can_access_this_channel": "Seuls les personnes invitées peuvent accéder à ce canal",
   "Just_invited_people_can_access_this_team": "Seules les personnes invitées peuvent accéder à cette équipe",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Mot de passe",
   "Language": "Langue",
   "last_message": "dernier message",
   "Last_owner_team_room": "Vous êtes le dernier propriétaire de ce canal. Une fois que vous quittez l'équipe, le canal sera conservé au sein de l'équipe mais vous le gérerez de l'extérieur.",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index 8651cb5eb9..324c7b373b 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -269,7 +269,7 @@
   "Finish_recording": "रेकॉर्डिंग समाप्त करें",
   "Following": "फॉलो कर रहा है",
   "Following_thread": "निरंतर थ्रेड",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, आपको जारी रखने के लिए अपना वर्तमान पासवर्ड दर्ज करना होगा",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, जारी रखने के लिए आपको अपने खाते का पासवर्ड दर्ज करना होगा।",
   "Forgot_password": "पासवर्ड भूल गए हैं?",
   "Forgot_password_If_this_email_is_registered": "यदि यह ईमेल पंजीकृत है, तो हम आपको पासवर्ड रीसेट करने के लिए निर्देश भेजेंगे। यदि आपको शीघ्रता से एक ईमेल प्राप्त नहीं होता है, तो कृपया वापस आकर पुनः प्रयास करें।",
   "Forward": "आगे बढ़ें",
@@ -316,6 +316,8 @@
   "Joined": "शामिल हो गए",
   "Just_invited_people_can_access_this_channel": "केवल निमंत्रित लोग इस चैनल तक पहुंच सकते हैं",
   "Just_invited_people_can_access_this_team": "केवल निमंत्रित लोग इस टीम तक पहुंच सकते हैं",
+  "Label_Input_Two_Factor_Code": "कोड",
+  "Label_Input_Two_Factor_Password": "पासवर्ड",
   "Language": "भाषा",
   "last_message": "आखिरी संदेश",
   "Last_owner_team_room": "आप इस चैनल के आखिरी मालिक हैं। जब आप टीम छोड़ेंगे, चैनल को टीम के अंदर रखा जाएगा, लेकिन आप इसे बाहर से प्रबंधित करेंगे।",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index 947cee0b15..d295ce6a79 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -269,7 +269,7 @@
   "Finish_recording": "Rögzítés befejezése",
   "Following": "Követve",
   "Following_thread": "Követett szál",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "A biztonsága érdekében meg kell adnia a jelenlegi jelszavát a folytatáshoz",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "A biztonsága érdekében meg kell adnia a fiókja jelszavát a folytatáshoz.",
   "Forgot_password": "Elfelejtette a jelszavát?",
   "Forgot_password_If_this_email_is_registered": "Ha ez az e-mail-cím regisztrálva van, akkor utasításokat küldünk a jelszó visszaállításához. Ha nem kap rövidesen e-mailt, akkor térjen vissza, és próbálja meg újra.",
   "Forward": "Továbbítás",
@@ -317,6 +317,8 @@
   "Jump_to_message": "Ugrás az üzenethez",
   "Just_invited_people_can_access_this_channel": "Csak a meghívott személyek férhetnek hozzá ehhez a csatornához.",
   "Just_invited_people_can_access_this_team": "Csak meghívott emberek férhetnek hozzá ehhez a csapathoz",
+  "Label_Input_Two_Factor_Code": "Kód",
+  "Label_Input_Two_Factor_Password": "Jelszó",
   "Language": "Nyelv",
   "last_message": "utolsó üzenet",
   "Last_owner_team_room": "Ön az utolsó tulajdonosa ennek a csatornának. Ha elhagyja a csapatot, a csatorna a csapaton belül marad, de Ön kívülről fogja kezelni.",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index d332e1d9d2..59eaba5a13 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -185,7 +185,7 @@
   "Finish_recording": "Termina registrazione",
   "Following": "Seguiti",
   "Following_thread": "Thread seguito",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Per garantire la sicurezza del tuo account, inserisci la password per continuare.",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Per la tua sicurezza, devi inserire la password del tuo account per continuare.",
   "Forgot_password": "Password dimenticata",
   "Forgot_password_If_this_email_is_registered": "Se questa e-mail è registrata, manderemo istruzioni su come resettare la tua password. Se non ricevi nulla, torna qui e riprova di nuovo.",
   "Forward": "Inoltra",
@@ -226,6 +226,8 @@
   "Join_the_given_channel": "Entra nel canale specificato",
   "Just_invited_people_can_access_this_channel": "Solo le persone invitate possono accedere a questo canale",
   "Just_invited_people_can_access_this_team": "Solo le persone invitate possono accedere a questo team",
+  "Label_Input_Two_Factor_Code": "Codice",
+  "Label_Input_Two_Factor_Password": "Password",
   "Language": "Lingua",
   "last_message": "ultimo messaggio",
   "Leave": "Lasciare il canale",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index 681a5047a3..67e3833f29 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -159,7 +159,7 @@
   "Files": "ファイル",
   "Finish_recording": "録音停止",
   "Following_thread": "スレッド更新時に通知",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "セキュリティのため、続けるには現在のパスワードを入力してください。",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "セキュリティのために、続行するにはアカウントのパスワードを入力する必要があります。",
   "Forgot_password": "パスワードを忘れた",
   "Forgot_password_If_this_email_is_registered": "送信したメールアドレスが登録されていれば、パスワードのリセット方法を送信しました。メールアドレスがすぐに来ない場合はやり直してください。",
   "Forward": "転送",
@@ -198,6 +198,8 @@
   "Join_the_given_channel": "指定したチャネルに参加",
   "Just_invited_people_can_access_this_channel": "招待されたユーザーだけがこのチャンネルに参加できます",
   "Just_invited_people_can_access_this_team": "招待されたユーザーのみがこのチームにアクセスできます",
+  "Label_Input_Two_Factor_Code": "コード",
+  "Label_Input_Two_Factor_Password": "パスワード",
   "Language": "言語",
   "last_message": "最後のメッセージ",
   "Leave": "ルームを退出",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index c32a604afa..f9d395c377 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -212,7 +212,7 @@
   "Finish_recording": "Opname beëindigen",
   "Following": "Volgend",
   "Following_thread": "Volg discussie",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Voor je veiligheid moet je je huidige wachtwoord invoeren om door te gaan",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Voor uw veiligheid moet u uw accountwachtwoord invoeren om door te gaan.",
   "Forgot_password": "Wachtwoord vergeten?",
   "Forgot_password_If_this_email_is_registered": "Als dit e-mailadres geregistreerd is, sturen we instructies om je wachtwoord opnieuw in te stellen. Als je geen e-mail ontvangt, kom dan terug en probeer het opnieuw.",
   "Forward": "Doorsturen",
@@ -254,6 +254,8 @@
   "Join_the_given_channel": "Word lid van het gegeven kanaal",
   "Just_invited_people_can_access_this_channel": "Alleen uitgenodigde mensen hebben toegang tot dit kanaal",
   "Just_invited_people_can_access_this_team": "Alleen uitgenodigde mensen hebben toegang tot dit team",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Wachtwoord",
   "Language": "Taal",
   "last_message": "laatste bericht",
   "Last_owner_team_room": "Je bent de laatste eigenaar van dit kanaal. Zodra u het team verlaat, blijft het kanaal binnen het team, maar beheert u het van buitenaf.",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index a5868a0715..eda5249a56 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -299,7 +299,7 @@
   "Finish_recording": "Encerrar gravação",
   "Following": "Seguindo",
   "Following_thread": "Começou a seguir tópico",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você precisa digitar sua senha",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você deve inserir a senha da sua conta para continuar.",
   "Forgot_password": "Esqueceu sua senha?",
   "Forgot_password_If_this_email_is_registered": "Se este e-mail estiver cadastrado, enviaremos instruções sobre como redefinir sua senha. Se você não receber um e-mail em breve, volte e tente novamente.",
   "Forward": "Encaminhar",
@@ -356,6 +356,8 @@
   "Jump_to_message": "Ir para mensagem",
   "Just_invited_people_can_access_this_channel": "Apenas as pessoas convidadas podem acessar este canal",
   "Just_invited_people_can_access_this_team": "Apenas as pessoas convidadas podem acessar este time",
+  "Label_Input_Two_Factor_Code": "Código",
+  "Label_Input_Two_Factor_Password": "Senha",
   "Language": "Idioma",
   "last_message": "última mensagem",
   "Last_owner_team_room": "Você é o último dono deste canal. Uma vez que você deixe o time, o canal será mantido dentro do time, mas você estará administrando-o de fora.",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 47ff5395e8..cf8a59e888 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -154,7 +154,7 @@
   "Files": "Ficheiros",
   "Finish_recording": "Terminar a gravação",
   "Following_thread": "Seguir discussão",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você deve escrever a sua palavra-passe actual para continuar",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, deve introduzir a palavra-passe da sua conta para continuar.",
   "Forgot_password": "Esquecer palavra-passe",
   "Forgot_password_If_this_email_is_registered": "Se este e-mail estiver registado, enviaremos instruções sobre como repor a sua palavra-passe. Se você não receber um e-mail em breve, volte e tente novamente.",
   "Forward": "Reencaminhar",
@@ -193,6 +193,8 @@
   "Join_the_given_channel": "Entrar no canal apresentado",
   "Just_invited_people_can_access_this_channel": "Apenas utilizadores convidados podem aceder a este canal",
   "Just_invited_people_can_access_this_team": "Apenas pessoas convidadas podem aceder a esta equipa",
+  "Label_Input_Two_Factor_Code": "Código",
+  "Label_Input_Two_Factor_Password": "Palavra-passe",
   "Language": "Idioma",
   "last_message": "última mensagem",
   "Leave": "Sair",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index b6133c7953..8a94cef348 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -238,7 +238,7 @@
   "Finish_recording": "Завершить запись",
   "Following": "Следить",
   "Following_thread": "Следить за тредом",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "В целях вашей безопасности вы должны ввести свой текущий пароль для продолжения",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Для вашей безопасности вы должны ввести пароль от вашего аккаунта, чтобы продолжить.",
   "Forgot_password": "Забыли пароль",
   "Forgot_password_If_this_email_is_registered": "Если эта электронная почта зарегистрирована, мы отправим инструкции о том, как сбросить пароль. Если вы не получите письмо в ближайшее время, вернитесь и повторите попытку.",
   "Forward": "Перенаправить",
@@ -281,6 +281,8 @@
   "Joined": "участвовал",
   "Just_invited_people_can_access_this_channel": "Только приглашенные люди могут получить доступ к этому каналу",
   "Just_invited_people_can_access_this_team": "Только приглашенные пользователи могут получить доступ к этой Команде",
+  "Label_Input_Two_Factor_Code": "Код",
+  "Label_Input_Two_Factor_Password": "Пароль",
   "Language": "Язык",
   "last_message": "последнее сообщение",
   "Last_owner_team_room": "Вы последний владелец этого чата. Как только вы покинете Команду, чат будет храниться внутри нее, но вы будете управлять ею снаружи.",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index 399e45e783..8ef2c1c9dc 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -223,7 +223,7 @@
   "Finish_recording": "Zaključek snemanja",
   "Following": "Sledenje",
   "Following_thread": "Naslednja nit",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Zaradi svoje varnosti morate za nadaljevanje vnesti trenutno geslo",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Zaradi vaše varnosti morate vnesti geslo za svoj račun, da nadaljujete.",
   "Forgot_password": "Pozabljeno geslo",
   "Forgot_password_If_this_email_is_registered": "Če je ta elektronski naslov registriran, bomo poslali navodila, kako ponastaviti geslo. Če v kratkem ne prejmete e -pošte, se vrnite in poskusite znova.",
   "Forward": "Posreduj",
@@ -264,6 +264,8 @@
   "Join_the_given_channel": "Pridružite se določenemu kanalu",
   "Just_invited_people_can_access_this_channel": "Do tega kanala lahko dostopajo samo povabljeni",
   "Just_invited_people_can_access_this_team": "Samo povabljeni ljudje lahko dostopajo do te ekipe",
+  "Label_Input_Two_Factor_Code": "Koda",
+  "Label_Input_Two_Factor_Password": "Geslo",
   "Language": "Jezik",
   "last_message": "Zadnje sporočilo",
   "Last_owner_team_room": "Ste zadnji lastnik tega kanala. Ko zapustite ekipo, bo kanal zadržan v ekipi, vendar ga boste upravljali od zunaj.",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 2ec4479665..4a8192bfef 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -247,7 +247,7 @@
   "Finish_recording": "Avsluta inspelningen",
   "Following": "Följer",
   "Following_thread": "Följer tråd",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "För din  egen säkerhet måste du ange ditt nuvarande lösenord för att fortsätta",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "För din säkerhet måste du ange ditt kontolösenord för att fortsätta.",
   "Forgot_password": "Glömt lösenordet?",
   "Forgot_password_If_this_email_is_registered": "Om e-postadressen är registrerad skickar vi anvisningar för hur du återställer lösenordet. Om du inte får ett e-postmeddelande inom kort får du komma tillbaka och försöka igen.",
   "Forward": "Vidarebefordra",
@@ -290,6 +290,8 @@
   "Joined": "Anslöt",
   "Just_invited_people_can_access_this_channel": "Endast inbjudna har åtkomst till den här kanalen",
   "Just_invited_people_can_access_this_team": "Endast inbjudna har åtkomst till det här teamet",
+  "Label_Input_Two_Factor_Code": "Kod",
+  "Label_Input_Two_Factor_Password": "Lösenord",
   "Language": "Språk",
   "last_message": "senaste meddelandet",
   "Last_owner_team_room": "Du är den sista ägaren av kanalen. När du har lämnat teamet behålls kanalen i teamet, men du får hantera den utifrån.",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index e5a09fb0ce..68242e1b12 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -269,7 +269,7 @@
   "Finish_recording": "பதிவு முடிக்கவும்",
   "Following": "பின்பாகம்",
   "Following_thread": "பின்னூட்டம் பின்னுக்குகின்றது",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "உங்களுக்காக பாதுகாக்கத்தக்கது, தொடர உங்கள் தற்போதைய கடவுச்சொல்லை உள்ளிட வேண்டும்",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "உங்கள் பாதுகாப்பிற்காக, தொடர்ந்து செல்ல உங்கள் கணக்கு கடவுச்சொல்லை உள்ளிட வேண்டும்.",
   "Forgot_password": "உங்கள் கடவுச்சொல்லை மறந்துவிட்டீர்களா?",
   "Forgot_password_If_this_email_is_registered": "இந்த மின்னஞ்சல் பதிவு செய்யப்பட்டிருந்தால், உங்கள் கடவுச்சொல் எப்போது மீள்விக்கப்படும் என்று நிருபருக்கு அறிவித்துக் கொள்ளும். குறிப்பாக ஏதேனும் புதிய மின்னஞ்சல் பெறாதால், மீண்டும் மீண்டும் வருகின்று முயற்சிக்கவும்.",
   "Forward": "முன்னேற்று",
@@ -316,6 +316,8 @@
   "Joined": "சேர்ந்தன",
   "Just_invited_people_can_access_this_channel": "எந்தவொரு அழைப்பவரும் இந்த சேனலுக்கு அணுகலாம்",
   "Just_invited_people_can_access_this_team": "எந்தவொரு அழைப்பவரும் இந்த அணுகும் குழுக்கு அணுகலாம்",
+  "Label_Input_Two_Factor_Code": "குறியீடு",
+  "Label_Input_Two_Factor_Password": "கடவுச்சொல்",
   "Language": "மொழி",
   "last_message": "கடைசி செய்தி",
   "Last_owner_team_room": "நீங்கள் இந்த சேனலின் கடைசி உரிமையாளர். குழுவிலிருந்து நீங்கள் விடுவிக்கின்றீர்கள் பின்னர், சேனல் குழுவினுள் உள்ளது, ஆனால் நீங்கள் இதை வெளியேறியிருப்பது.",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 1edf105c14..3b112edb1c 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -269,7 +269,7 @@
   "Finish_recording": "రికార్డింగ్ ముగించండి",
   "Following": "అనుసరించుతుంది",
   "Following_thread": "అనుసరించుకోవడానికి థ్రెడ్",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "మీ భద్రతా కోసం, మీరు కొన్ని సమయంగా మీ ప్రస్తుత పాస్‌వర్డ్‌ను నమోదు చేయాలి",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, जारी रखने के लिए आपको अपने खाते का पासवर्ड दर्ज करना होगा।",
   "Forgot_password": "మీ పాస్‌వర్డ్ మరచిపోయారా?",
   "Forgot_password_If_this_email_is_registered": "ఈ ఇ-మెయిల్ నమోదు చేసినట్లు, మేము మీ పాస్‌వర్డ్‌ను రీసెట్ చేయడానికి సూచనలు పంపబడిపోతాము. మీరు చాలా తక్కువగా ఒక ఇ-మెయిల్ లభిస్తే, దయచేసి మరియువకాయ ప్రయాసించండి.",
   "Forward": "అగ్రగామించండి",
@@ -316,6 +316,8 @@
   "Joined": "చేరారు",
   "Just_invited_people_can_access_this_channel": "కేవలం ఆమంత్రణపెట్టబడిన వారు ఈ ఛానల్‌కు ప్రవేశించవచ్చు",
   "Just_invited_people_can_access_this_team": "కేవలం ఆమంత్రణపెట్టబడిన వారు ఈ టీమ్‌కు ప్రవేశించవచ్చు",
+  "Label_Input_Two_Factor_Code": "कोड",
+  "Label_Input_Two_Factor_Password": "पासवर्ड",
   "Language": "భాష",
   "last_message": "చివరి సందేశం",
   "Last_owner_team_room": "మీరు ఈ ఛానల్‌కు చివరి యజమాని. మీరు టీమ్ ను విడిచిపోతే, ఛానల్ టీమ్ లో ఉంటుంది కాని మీరు వాడు బాహ్యాంతరం నుండి అదనపుడు నిర్వహిస్తారు.",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index 5647df5c57..59f29c5a16 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -172,7 +172,7 @@
   "Finish_recording": "Kaydı bitir",
   "Following": "Takip ediliyor",
   "Following_thread": "Konu takip ediliyor",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Güvenliğiniz için, devam etmek için mevcut şifrenizi girmelisiniz",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Güvenliğiniz için devam etmek üzere hesap şifrenizi girmeniz gerekmektedir.",
   "Forgot_password": "Parolanızı mı unuttunuz?",
   "Forgot_password_If_this_email_is_registered": "Bu e-posta kayıtlıysa, şifrenizi nasıl sıfırlayacağınıza dair talimatlar göndereceğiz. Kısa süre içinde bir e-posta almazsanız, lütfen geri gelin ve tekrar deneyin.",
   "Forward": "İlet",
@@ -211,6 +211,8 @@
   "Join_Code": "Katılım Kodu",
   "Join_the_given_channel": "Verilen kanala katıl",
   "Just_invited_people_can_access_this_channel": "Yalnızca davet edilen kişiler bu kanala erişebilir",
+  "Label_Input_Two_Factor_Code": "Kod",
+  "Label_Input_Two_Factor_Password": "Şifre",
   "Language": "Dil",
   "last_message": "son ileti",
   "Leave": "Odadan ayrıl",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index d71d89fc40..3a0ac18fe7 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -168,7 +168,7 @@
   "Finish_recording": "完成录制",
   "Following": "正在追踪",
   "Following_thread": "追踪的讨论串",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "出于安全考虑，您必须输入您的密码以便继续操作",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "为了您的安全，您必须输入您的账户密码才能继续。",
   "Forgot_password": "忘记密码",
   "Forgot_password_If_this_email_is_registered": "如果这邮箱已注册，我们将发送如何重置密码的说明。如果您没有在短时间内收到电子邮件，请再试一次。",
   "Forward": "转发",
@@ -198,6 +198,8 @@
   "is_typing": "正在输入",
   "Join": "加入",
   "Just_invited_people_can_access_this_channel": "仅有被邀请人能进入这个频道",
+  "Label_Input_Two_Factor_Code": "代码",
+  "Label_Input_Two_Factor_Password": "密码",
   "Language": "语言",
   "last_message": "最后一条信息",
   "leave": "离开",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index d14281b3c7..c68e117b02 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -176,7 +176,7 @@
   "Finish_recording": "完成錄製",
   "Following": "正在追蹤",
   "Following_thread": "追蹤的討論串",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "為了您的安全，您必須重新輸入密碼才能繼續",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "為了您的安全，您必須輸入您的帳戶密碼以繼續。",
   "Forgot_password": "忘記密碼",
   "Forgot_password_If_this_email_is_registered": "如果此電子郵件已註冊，我們將發送有關如何重設密碼的說明。如果您未在短時間內收到電子郵件，請再試一次。",
   "Forward": "轉發",
@@ -212,6 +212,8 @@
   "Join": "加入",
   "Join_the_given_channel": "加入現有頻道",
   "Just_invited_people_can_access_this_channel": "僅有受邀者能存取此頻道",
+  "Label_Input_Two_Factor_Code": "程式碼",
+  "Label_Input_Two_Factor_Password": "密碼",
   "Language": "語言",
   "last_message": "最後一則訊息",
   "Leave": "離開",
diff --git a/app/lib/constants/colors.ts b/app/lib/constants/colors.ts
index f2af702b7d..345fe39221 100644
--- a/app/lib/constants/colors.ts
+++ b/app/lib/constants/colors.ts
@@ -1,4 +1,5 @@
 const backdropColor = '#000000';
+const overlayBackground = 'rgba(31, 35, 41, 0.65)';
 
 const light = {
 	surfaceLight: '#FFFFFF',
@@ -280,18 +281,21 @@ export const colors = {
 	light: {
 		...light,
 		backdropColor,
+		overlayBackground,
 		backdropOpacity: 0.3,
 		attachmentLoadingOpacity: 0.7
 	},
 	dark: {
 		...dark,
 		backdropColor,
+		overlayBackground,
 		backdropOpacity: 0.9,
 		attachmentLoadingOpacity: 0.3
 	},
 	black: {
 		...black,
 		backdropColor,
+		overlayBackground,
 		backdropOpacity: 0.9,
 		attachmentLoadingOpacity: 0.3
 	}