diff --git a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard
index b6b9edafa..def928604 100644
--- a/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard
+++ b/Riot/Modules/KeyVerification/Common/ScanConfirmation/KeyVerificationScanConfirmationViewController.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="V8j-Lb-PgC">
-    <device id="retina6_1" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<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="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,7 +11,7 @@
         <!--Key Verification Scan Confirmation View Controller-->
         <scene sceneID="mt5-wz-YKA">
             <objects>
-                <viewController extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="V8j-Lb-PgC" customClass="KeyVerificationScanConfirmationViewController" customModule="Riot" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="V8j-Lb-PgC" customClass="KeyVerificationScanConfirmationViewController" customModule="Element" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="EL9-GA-lwo">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -33,18 +31,18 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="key_verification_success_shield" translatesAutoresizingMaskIntoConstraints="NO" id="Uad-3w-cQ4">
+                                                    <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="UJY-Bw-abr">
                                                         <rect key="frame" x="147" y="88" width="120" height="120"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" constant="120" id="3RB-i8-S1k"/>
-                                                            <constraint firstAttribute="width" secondItem="Uad-3w-cQ4" secondAttribute="height" multiplier="1:1" id="vrj-Sp-Wpu"/>
+                                                            <constraint firstAttribute="width" secondItem="UJY-Bw-abr" secondAttribute="height" multiplier="1:1" id="Ifm-nK-cZw"/>
+                                                            <constraint firstAttribute="width" constant="120" id="oJz-lG-JfE"/>
                                                         </constraints>
-                                                    </imageView>
+                                                    </activityIndicatorView>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="t0L-ns-MGv">
                                                         <rect key="frame" x="20" y="238" width="374" height="118.5"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Waiting..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hwq-X6-Gl2">
-                                                                <rect key="frame" x="151.5" y="0.0" width="71.5" height="20.5"/>
+                                                                <rect key="frame" x="151.5" y="0.0" width="71" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" red="0.3803921569" green="0.43921568630000002" blue="0.5450980392" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -61,7 +59,7 @@
                                                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="8Ou-Xh-0rC">
                                                                         <rect key="frame" x="0.0" y="48" width="374" height="40"/>
                                                                         <subviews>
-                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kBt-2D-25V" customClass="RoundedButton" customModule="Riot" customModuleProvider="target">
+                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kBt-2D-25V" customClass="RoundedButton" customModule="Element" customModuleProvider="target">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="182" height="40"/>
                                                                                 <inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
                                                                                 <state key="normal" title="No">
@@ -71,7 +69,7 @@
                                                                                     <action selector="rejectButtonAction:" destination="V8j-Lb-PgC" eventType="touchUpInside" id="qCV-Oh-YAG"/>
                                                                                 </connections>
                                                                             </button>
-                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="03A-fe-h3s" customClass="RoundedButton" customModule="Riot" customModuleProvider="target">
+                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="03A-fe-h3s" customClass="RoundedButton" customModule="Element" customModuleProvider="target">
                                                                                 <rect key="frame" x="192" y="0.0" width="182" height="40"/>
                                                                                 <inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
                                                                                 <state key="normal" title="Yes">
@@ -110,15 +108,14 @@
                                                 </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
-                                                    <constraint firstItem="Uad-3w-cQ4" firstAttribute="centerX" secondItem="A5W-J0-Sfd" secondAttribute="centerX" id="9qA-xE-FuB"/>
+                                                    <constraint firstItem="UJY-Bw-abr" firstAttribute="top" secondItem="FO8-rD-Y21" secondAttribute="bottom" constant="30" id="7wz-6C-4Fv"/>
                                                     <constraint firstAttribute="bottom" secondItem="t0L-ns-MGv" secondAttribute="bottom" constant="20" id="BiO-bi-ZSe"/>
                                                     <constraint firstAttribute="trailing" secondItem="FO8-rD-Y21" secondAttribute="trailing" constant="20" id="K4J-VT-PtB"/>
                                                     <constraint firstItem="FO8-rD-Y21" firstAttribute="leading" secondItem="A5W-J0-Sfd" secondAttribute="leading" constant="20" id="TBg-VP-Ogk"/>
                                                     <constraint firstAttribute="trailing" secondItem="t0L-ns-MGv" secondAttribute="trailing" constant="20" id="X3d-TI-hpD"/>
                                                     <constraint firstAttribute="width" priority="750" constant="500" id="bf9-gx-A9v"/>
-                                                    <constraint firstItem="t0L-ns-MGv" firstAttribute="top" secondItem="Uad-3w-cQ4" secondAttribute="bottom" constant="30" id="iid-Cr-vcT"/>
+                                                    <constraint firstItem="t0L-ns-MGv" firstAttribute="top" secondItem="UJY-Bw-abr" secondAttribute="bottom" constant="30" id="iSR-47-RJL"/>
                                                     <constraint firstItem="FO8-rD-Y21" firstAttribute="top" secondItem="A5W-J0-Sfd" secondAttribute="top" constant="40" id="tCz-QS-z3b"/>
-                                                    <constraint firstItem="Uad-3w-cQ4" firstAttribute="top" secondItem="FO8-rD-Y21" secondAttribute="bottom" constant="30" id="xAe-qf-pOf"/>
                                                     <constraint firstItem="t0L-ns-MGv" firstAttribute="leading" secondItem="A5W-J0-Sfd" secondAttribute="leading" constant="20" id="xD5-z1-arO"/>
                                                 </constraints>
                                             </view>
@@ -142,14 +139,15 @@
                                 </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"/>
                             <constraint firstItem="9U2-KL-ZVA" firstAttribute="leading" secondItem="bFg-jh-JZB" secondAttribute="leading" id="GdQ-hK-muG"/>
+                            <constraint firstItem="UJY-Bw-abr" firstAttribute="centerX" secondItem="bFg-jh-JZB" secondAttribute="centerX" id="eVj-7W-dkG"/>
                             <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="confirmButton" destination="03A-fe-h3s" id="lDk-ec-qrl"/>
@@ -166,7 +164,4 @@
             <point key="canvasLocation" x="-3198" y="-647"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="key_verification_success_shield" width="120" height="120"/>
-    </resources>
 </document>