diff --git a/app/containers/TwoFactor/index.tsx b/app/containers/TwoFactor/index.tsx
index 3fc57e038b..785df41849 100644
--- a/app/containers/TwoFactor/index.tsx
+++ b/app/containers/TwoFactor/index.tsx
@@ -126,12 +126,7 @@ const TwoFactor = React.memo(() => {
 	const color = colors.fontTitlesLabels;
 	return (
 		<Modal
-			customBackdrop={
-				<View
-					accessible
-					accessibilityLabel={I18n.t('Close_Modal')}
-					style={[styles.overlay, { backgroundColor: colors.overlayBackground }]}></View>
-			}
+			customBackdrop={<View aria-hidden style={[styles.overlay, { backgroundColor: colors.overlayBackground }]} />}
 			avoidKeyboard
 			useNativeDriver
 			isVisible={visible}
@@ -143,27 +138,24 @@ const TwoFactor = React.memo(() => {
 						isMasterDetail && [sharedStyles.modalFormSheet, styles.tablet],
 						{ backgroundColor: colors.surfaceTint }
 					]}>
-					<View
-						accessibilityLabel={`${method?.text ? I18n.t(method.text) : I18n.t(method?.title || 'Two_Factor_Authentication')}`}>
-						<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
-							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())}
-							returnKeyType='send'
-							autoCapitalize='none'
-							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={{ marginBottom: 36 }}
-						/>
-					</View>
+					<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
+						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}
+						containerStyle={styles.containerInput}
+					/>
 
 					{isEmail ? (
 						<Button
diff --git a/app/containers/TwoFactor/styles.ts b/app/containers/TwoFactor/styles.ts
index 1f27a6a20f..092149acc4 100644
--- a/app/containers/TwoFactor/styles.ts
+++ b/app/containers/TwoFactor/styles.ts
@@ -38,7 +38,8 @@ export default StyleSheet.create({
 	},
 	buttonContainer: {
 		flexDirection: 'row',
-		justifyContent: 'space-between'
+		justifyContent: 'space-between',
+		marginTop: 36
 	},
 	tablet: {
 		height: undefined
@@ -47,5 +48,13 @@ export default StyleSheet.create({
 		flex: 1,
 		alignItems: 'center',
 		justifyContent: 'center'
+	},
+	containerInput: {
+		marginBottom: 0
+	},
+	resendEmailText: {
+		...sharedStyles.textBold,
+		fontSize: 12,
+		lineHeight: 18
 	}
 });
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index be24835b2a..00a341af2b 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -68,7 +68,6 @@
   "Click_to_join": "انقر للانضمام!",
   "Close": "إغلاق",
   "Close_emoji_selector": "إغلاق محدد الرموز التعبيرية",
-  "Close_Modal": "إغلاق النافذة المنبثقة",
   "Code_or_password_invalid": "الرمز أو كلمة المرور خاطئة",
   "Collaborative": "تعاونية",
   "Confirm": "تأكيد",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index 7fc960daf5..f12a89f616 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -118,7 +118,6 @@
   "Close": "বন্ধ করুন",
   "Close_Chat": "চ্যাট বন্ধ করুন",
   "Close_emoji_selector": "ইমোজি সিলেক্টর বন্ধ করুন",
-  "Close_Modal": "মোডাল বন্ধ করুন।",
   "Code_or_password_invalid": "কোড বা পাসওয়ার্ড অবৈধ",
   "Collaborative": "সহযোগী",
   "Condensed": "সংকোচিত",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index 484fb2df41..048c17581d 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -125,7 +125,6 @@
   "Close": "Zavřít",
   "Close_Chat": "Zavřít chat",
   "Close_emoji_selector": "Zavřít výběr emodži",
-  "Close_Modal": "Zavřít okno",
   "Code_block": "Blok kódu",
   "Code_or_password_invalid": "Neplatný kód nebo heslo",
   "Collaborative": "Spolupráce",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index 7e6aae9fdb..ae953aa96b 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -113,7 +113,6 @@
   "Close": "Schließen",
   "Close_Chat": "Chat schließen",
   "Close_emoji_selector": "Emoji-Auswahl schließen",
-  "Close_Modal": "Modal schließen",
   "Code_or_password_invalid": "Code oder Passwort sind falsch",
   "Collaborative": "Kollaborativ",
   "Condensed": "Komprimiert",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 3f4063661f..cbf8d069eb 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -127,7 +127,6 @@
   "Close": "Close",
   "Close_Chat": "Close chat",
   "Close_emoji_selector": "Close emoji selector",
-  "Close_Modal": "Close Modal",
   "Code_block": "Code block",
   "Code_or_password_invalid": "Code or password invalid",
   "Collaborative": "Collaborative",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index f972775c15..f470c6d6c5 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -52,7 +52,6 @@
   "Click_to_join": "¡Unirme!",
   "Close": "Cerrar",
   "Close_emoji_selector": "Cerrar selector de emojis",
-  "Close_Modal": "Cerrar modal",
   "Collaborative": "Colaborativo",
   "Confirm": "Confirmar",
   "Connect": "Conectar",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 79579a0d7e..85e55a5b2e 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -103,7 +103,6 @@
   "Close": "Sulje",
   "Close_Chat": "Sulje keskustelu",
   "Close_emoji_selector": "Sulje emojien valitsin",
-  "Close_Modal": "Sulje modalivalikko",
   "Code_or_password_invalid": "Koodi tai salasana virheellinen",
   "Collaborative": "Yhteistyö",
   "Condensed": "Tiivistetty",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index bbaa5afe1e..2371afb8e9 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -80,7 +80,6 @@
   "Click_to_join": "Cliquez pour rejoindre !",
   "Close": "Fermer",
   "Close_emoji_selector": "Fermer le sélecteur d'émoji",
-  "Close_Modal": "Fermer la fenêtre modale",
   "Code_or_password_invalid": "Code ou mot de passe invalide",
   "Collaborative": "Collaboratif",
   "Condensed": "Condensé",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index 80fb419a7a..324c7b373b 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -118,7 +118,6 @@
   "Close": "बंद करें",
   "Close_Chat": "चैट बंद करें",
   "Close_emoji_selector": "इमोजी चयनकर्ता बंद करें",
-  "Close_Modal": "मोडल बंद करें।",
   "Code_or_password_invalid": "कोड या पासवर्ड अमान्य है",
   "Collaborative": "सहयोगी",
   "Condensed": "संक्षेपित",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index e77e30db48..d295ce6a79 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -118,7 +118,6 @@
   "Close": "Bezár",
   "Close_Chat": "Csevegés lezárása",
   "Close_emoji_selector": "Emoji választó bezárása",
-  "Close_Modal": "Bezárás modalban",
   "Code_or_password_invalid": "A kód vagy a jelszó érvénytelen",
   "Collaborative": "Együttműködés",
   "Condensed": "Rövidített",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 0a65f945c0..59eaba5a13 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -74,7 +74,6 @@
   "Click_to_join": "Clicca per unirti!",
   "Close": "Chiudi",
   "Close_emoji_selector": "Chiudi selettore emoji",
-  "Close_Modal": "Chiudi Modale",
   "Code_or_password_invalid": "Codice o password non validi",
   "Collaborative": "Collaborativo",
   "Confirm": "Conferma",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index 689467c0ee..67e3833f29 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -67,7 +67,6 @@
   "Click_to_join": "クリックして参加！",
   "Close": "閉じる",
   "Close_emoji_selector": "絵文字ピッカーを閉じる",
-  "Close_Modal": "モーダルを閉じる",
   "Code_or_password_invalid": "無効なコードまたはパスワード",
   "Collaborative": "コラボ",
   "Confirm": "承認",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index 660470a77c..f9d395c377 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -80,7 +80,6 @@
   "Click_to_join": "Klik om mee te doen!",
   "Close": "Sluiten",
   "Close_emoji_selector": "Emoji-kiezer sluiten",
-  "Close_Modal": "Sluit venster",
   "Code_or_password_invalid": "Code of wachtwoord ongeldig",
   "Collaborative": "Samenwerkend",
   "Condensed": "Gecondenseerd",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index 675db12837..eda5249a56 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -125,7 +125,6 @@
   "Close": "Fechar",
   "Close_Chat": "Fechar conversa",
   "Close_emoji_selector": "Fechar seletor de emojis",
-  "Close_Modal": "Fechar Modal",
   "Code_or_password_invalid": "Código ou senha inválido",
   "Collaborative": "Colaborativo",
   "Community_edition_push_quota": "Cota de notificações push community edition",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 71ac788c53..cf8a59e888 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -64,7 +64,6 @@
   "Click_to_join": "Clique para Entrar!",
   "Close": "Fechar",
   "Close_emoji_selector": "Fechar selector de emoticons",
-  "Close_Modal": "Fechar Modal",
   "Code_or_password_invalid": "Código ou senha inválidos",
   "Collaborative": "Colaborativa",
   "Confirm": "Confirmar",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index 6e0d0a1c81..8a94cef348 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -99,7 +99,6 @@
   "Close": "Закрыть",
   "Close_Chat": "Закрыть чат",
   "Close_emoji_selector": "Закрыть выбор emoji",
-  "Close_Modal": "Закрыть окно",
   "Code_or_password_invalid": "Код или пароль не верны",
   "Collaborative": "Совместный",
   "Condensed": "Упрощенный",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index 219668c635..8ef2c1c9dc 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -85,7 +85,6 @@
   "Close": "Zapri",
   "Close_Chat": "Zaprite klepet",
   "Close_emoji_selector": "Zapri izbirnik čustvenih simbolov",
-  "Close_Modal": "Zapri modalno okno",
   "Code_or_password_invalid": "Koda ali geslo ni veljavno",
   "Collaborative": "Sodelovanje",
   "Condensed": "Kondenzirano",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 461dd6e0ad..4a8192bfef 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -103,7 +103,6 @@
   "Close": "Stäng",
   "Close_Chat": "Stäng chatt",
   "Close_emoji_selector": "Stäng emojiväljaren",
-  "Close_Modal": "Stäng modal",
   "Code_or_password_invalid": "Koden eller lösenordet är ogiltigt",
   "Collaborative": "Samarbete",
   "Condensed": "Komprimerade",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 4979ef06a7..68242e1b12 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -118,7 +118,6 @@
   "Close": "மூடு",
   "Close_Chat": "உரையாடலை மூடு",
   "Close_emoji_selector": "எமோஜி தேர்ந்தெடுக்கும் வழிமுறை மூடு",
-  "Close_Modal": "மூடுக.",
   "Code_or_password_invalid": "குறியீடு அல்லது கடவுச்சொல் தவறானது",
   "Collaborative": "ஒருமித்த",
   "Condensed": "குறைந்தது",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index dd295478f2..3b112edb1c 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -118,7 +118,6 @@
   "Close": "మూసివేయి",
   "Close_Chat": "చాట్‌ను మూసివేయండి",
   "Close_emoji_selector": "ఎమోజి ఎంచుకోడానికి మూసివేయి",
-  "Close_Modal": "मॉडल बंद करें",
   "Code_or_password_invalid": "కోడ్ లేదా పాస్‌వర్డ్ చెల్లనిది",
   "Collaborative": "సహయోగం",
   "Condensed": "సంక్షేపించబడిన",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index 687bedf123..59f29c5a16 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -67,7 +67,6 @@
   "Click_to_join": "Katılmak için tıklayın!",
   "Close": "Kapat",
   "Close_emoji_selector": "Emoji seçiciyi kapat",
-  "Close_Modal": "Modali Kapat",
   "Code_or_password_invalid": "Kod veya şifre geçersiz",
   "Collaborative": "İşbirlikçi",
   "Confirm": "Onayla",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index afc73c9bac..3a0ac18fe7 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -67,7 +67,6 @@
   "Click_to_join": "点击以参与",
   "Close": "关闭",
   "Close_emoji_selector": "关闭 emoji 选择器",
-  "Close_Modal": "关闭模态框",
   "Code_or_password_invalid": "验证码或密码不正确",
   "Collaborative": "协作",
   "Confirm": "确认",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 9bedd14912..c68e117b02 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -67,7 +67,6 @@
   "Click_to_join": "點擊以參與",
   "Close": "關閉",
   "Close_emoji_selector": "關閉 emoji 選擇器",
-  "Close_Modal": "關閉模式框",
   "Code_or_password_invalid": "驗證碼或密碼不正確",
   "Collaborative": "協作",
   "Confirm": "確認",