diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings
index 5fa1f989d..aa16c2479 100644
--- a/Riot/Assets/de.lproj/Vector.strings
+++ b/Riot/Assets/de.lproj/Vector.strings
@@ -1212,7 +1212,7 @@
 "secrets_setup_recovery_key_storage_alert_message" = "✓ Drucke ihn aus und bewahre ihn an einem sicheren Ort auf\n✓ Speichere ihn auf einem USB-Stick oder einem Sicherungslaufwerk\n✓ Kopiere ihn zu deinem persönlichen Speicher im Netz";
 "secrets_setup_recovery_passphrase_title" = "Wiederherstellungsschlüssel";
 "secrets_setup_recovery_passphrase_information" = "Ein Wiederherstellungsschlüssel kann ein Satz sein, den du dir gut merken kannst.\n\nWenn du diesen vergisst, können deine Nachrichten nicht mehr entschlüsselt werden.";
-"secrets_setup_recovery_passphrase_additional_information" = "⚠️ Benutze hier nicht dein Account Passwort.";
+"secrets_setup_recovery_passphrase_additional_information" = "⚠️ Benutze hier nicht dein Passwort.";
 "secrets_setup_recovery_passphrase_validate_action" = "Fertig";
 "secrets_setup_recovery_passphrase_confirm_information" = "Gib deinen Wiederherstellungsschlüssel zur Bestätigung erneut ein.";
 "secrets_setup_recovery_passphrase_confirm_passphrase_title" = "";
@@ -1222,7 +1222,7 @@
 "secrets_reset_warning_title" = "Wenn Du die Verschlüsselung zurücksetzt:";
 "secrets_reset_warning_message" = "Du verlierst dadurch deinen gesamten bisherigen Nachrichtenverlauf, sowie verfizierte Geräte oder Nutzer!";
 "secrets_reset_reset_action" = "Zurücksetzen";
-"secrets_reset_authentication_message" = "Bitte gebe zur Bestätigung Dein Accountpassword ein!";
+"secrets_reset_authentication_message" = "Bestätige mit deinem Passwort!";
 "cross_signing_setup_banner_title" = "Verschlüsselung einrichten";
 "cross_signing_setup_banner_subtitle" = "Verifiziere deine weiteren Geräte bequemer";
 "major_update_title" = "Riot ist jetzt %@";
@@ -1331,7 +1331,6 @@
 
 "secrets_recovery_reset_action_part_1" = "Wiederherstellungsschlüssel vergessen?";
 "less" = "Weniger";
-"secrets_reset_authentication_message" = "Gib zum Bestätigen das Passwort deines Matrix-Kontos ein";
 "secrets_reset_reset_action" = "Zurücksetzen";
 "secrets_reset_warning_message" = "Du wirst ohne Nachrichtenverlauf, Nachrichten, vertraute Geräte oder vertraute Benutzer neustarten.";
 "secrets_reset_warning_title" = "Falls du alles zurücksetzt";
diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index c4599b2c8..a51e5e125 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -1714,7 +1714,7 @@ Tap the + to start adding people.";
 
 // Recovery passphrase
 
-"secrets_setup_recovery_passphrase_additional_information" = "⚠️ Do not use your account password.";
+"secrets_setup_recovery_passphrase_additional_information" = "⚠️ Do not use your password.";
 "secrets_setup_recovery_passphrase_title" = "Set a Security Phrase";
 "secrets_setup_recovery_passphrase_information" = "Enter a security phrase only you know, used to secure secrets on your server.";
 "secrets_setup_recovery_passphrase_validate_action" = "Done";
@@ -1734,7 +1734,7 @@ Tap the + to start adding people.";
 "secrets_reset_warning_title" = "If you reset everything";
 "secrets_reset_warning_message" = "You will restart with no history, no messages, trusted devices or trusted users.";
 "secrets_reset_reset_action" = "Reset";
-"secrets_reset_authentication_message" = "Enter your account password to confirm";
+"secrets_reset_authentication_message" = "Confirm with your password!";
 
 // MARK: - Cross-signing
 
diff --git a/Riot/Modules/Secrets/Reset/SecretsResetViewController.storyboard b/Riot/Modules/Secrets/Reset/SecretsResetViewController.storyboard
index 9ff64568a..1306e8b61 100644
--- a/Riot/Modules/Secrets/Reset/SecretsResetViewController.storyboard
+++ b/Riot/Modules/Secrets/Reset/SecretsResetViewController.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="V8j-Lb-PgC">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="V8j-Lb-PgC">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -20,10 +21,10 @@
                                 <rect key="frame" x="0.0" y="44" width="414" height="852"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e7g-um-WO4">
-                                        <rect key="frame" x="0.0" y="0.0" width="414" height="339"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="283"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="voD-3Q-ryt">
-                                                <rect key="frame" x="5" y="0.0" width="404.5" height="339"/>
+                                                <rect key="frame" x="5" y="0.0" width="404" height="283"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="secrets_reset_warning" translatesAutoresizingMaskIntoConstraints="NO" id="WeW-92-lD0">
                                                         <rect key="frame" x="180" y="30" width="44" height="44"/>
@@ -33,27 +34,30 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Only do this if you have no other device you can verify this device with.  " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ljr-lR-H2p">
-                                                        <rect key="frame" x="20" y="94" width="364.5" height="36"/>
+                                                        <rect key="frame" x="20" y="74" width="364" height="0.0"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" id="Ip5-7F-232"/>
+                                                        </constraints>
                                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="If you reset everything" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gry-K5-URB">
-                                                        <rect key="frame" x="20" y="160" width="364.5" height="18"/>
+                                                        <rect key="frame" x="20" y="104" width="364" height="18"/>
                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
-                                                        <color key="textColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                        <color key="textColor" systemColor="systemRedColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You will restart with no history, no messages, trusted devices or trusted users" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kvV-8I-XXw">
-                                                        <rect key="frame" x="20" y="193" width="364.5" height="36"/>
+                                                        <rect key="frame" x="20" y="137" width="364" height="36"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yPo-s1-j4H">
-                                                        <rect key="frame" x="0.0" y="269" width="404.5" height="50"/>
+                                                        <rect key="frame" x="0.0" y="213" width="404" height="50"/>
                                                         <subviews>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fps-LF-Ix9" customClass="RoundedButton" customModule="Riot" customModuleProvider="target">
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fps-LF-Ix9" customClass="RoundedButton" customModule="Riot" customModuleProvider="target">
                                                                 <rect key="frame" x="15" y="0.0" width="374" height="50"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="50" id="PfY-kj-KDw"/>
@@ -84,7 +88,7 @@
                                                 <constraints>
                                                     <constraint firstItem="kvV-8I-XXw" firstAttribute="leading" secondItem="Gry-K5-URB" secondAttribute="leading" id="0d6-bR-ILD"/>
                                                     <constraint firstItem="yPo-s1-j4H" firstAttribute="top" secondItem="kvV-8I-XXw" secondAttribute="bottom" constant="40" id="ARy-kZ-2tj"/>
-                                                    <constraint firstItem="Ljr-lR-H2p" firstAttribute="top" secondItem="WeW-92-lD0" secondAttribute="bottom" constant="20" id="BaZ-1G-gUe"/>
+                                                    <constraint firstItem="Ljr-lR-H2p" firstAttribute="top" secondItem="WeW-92-lD0" secondAttribute="bottom" id="BaZ-1G-gUe"/>
                                                     <constraint firstItem="Gry-K5-URB" firstAttribute="leading" secondItem="Ljr-lR-H2p" secondAttribute="leading" id="E4X-cE-vkr"/>
                                                     <constraint firstItem="Ljr-lR-H2p" firstAttribute="leading" secondItem="voD-3Q-ryt" secondAttribute="leading" constant="20" id="FOD-4K-svD"/>
                                                     <constraint firstItem="WeW-92-lD0" firstAttribute="top" secondItem="voD-3Q-ryt" secondAttribute="top" constant="30" id="LQY-SY-Sxh"/>
@@ -122,6 +126,7 @@
                                 </constraints>
                             </scrollView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="bFg-jh-JZB"/>
                         <color key="backgroundColor" red="0.94509803921568625" green="0.96078431372549022" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="9U2-KL-ZVA" secondAttribute="bottom" id="7Cb-nY-CsO"/>
@@ -129,7 +134,6 @@
                             <constraint firstItem="bFg-jh-JZB" firstAttribute="trailing" secondItem="9U2-KL-ZVA" secondAttribute="trailing" id="sbD-ek-vGJ"/>
                             <constraint firstItem="bFg-jh-JZB" firstAttribute="top" secondItem="9U2-KL-ZVA" secondAttribute="top" id="wTB-V6-IHV"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="bFg-jh-JZB"/>
                     </view>
                     <connections>
                         <outlet property="informationLabel" destination="Ljr-lR-H2p" id="Ggr-pn-LAv"/>
@@ -147,5 +151,8 @@
     </scenes>
     <resources>
         <image name="secrets_reset_warning" width="44" height="44"/>
+        <systemColor name="systemRedColor">
+            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Riot/Modules/Secrets/Reset/SecretsResetViewController.swift b/Riot/Modules/Secrets/Reset/SecretsResetViewController.swift
index 1ca0dbb09..1293cb642 100644
--- a/Riot/Modules/Secrets/Reset/SecretsResetViewController.swift
+++ b/Riot/Modules/Secrets/Reset/SecretsResetViewController.swift
@@ -122,7 +122,7 @@ final class SecretsResetViewController: UIViewController {
         
         self.scrollView.keyboardDismissMode = .interactive
         
-        self.informationLabel.text = VectorL10n.secretsResetInformation
+        self.informationLabel.text = ""
         
         self.warningTitle.text = VectorL10n.secretsResetWarningTitle
         self.warningMessage.text = VectorL10n.secretsResetWarningMessage