diff --git a/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.swift b/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.swift
index df29afb83..17f2a2b5e 100644
--- a/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.swift
+++ b/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.swift
@@ -55,7 +55,7 @@ final class KeyBackupBannerCell: MXKTableViewCell {
         self.closeButton.tintColor = theme.textPrimaryColor
         
         self.titleLabel.textColor = theme.textPrimaryColor
-        self.subtitleLabel.textColor = theme.tintColor
+        self.subtitleLabel.textColor = theme.textPrimaryColor
     }
     
     // MARK: - Life cycle
@@ -63,8 +63,8 @@ final class KeyBackupBannerCell: MXKTableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         
-        let shieldImage = Asset.Images.keyBackupLogo.image.withRenderingMode(.alwaysTemplate)
-        self.shieldImageView.image = shieldImage
+        let shieldImage = Asset.Images.secretsSetupKey.image.withRenderingMode(.alwaysTemplate)
+        self.shieldImageView.image = shieldImage 
         
         let closeImage = Asset.Images.closeBanner.image.withRenderingMode(.alwaysTemplate)
         self.closeButton.setImage(closeImage, for: .normal)
@@ -84,7 +84,7 @@ final class KeyBackupBannerCell: MXKTableViewCell {
         case .recover:
             title = VectorL10n.keyBackupRecoverBannerTitle
             subtitle = VectorL10n.keyBackupRecoverConnentBannerSubtitle
-        case .none:
+        default:
             title = nil
             subtitle = nil
         }
diff --git a/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.xib b/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.xib
index 6e933fc4d..8ca8e35df 100644
--- a/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.xib
+++ b/Riot/Modules/KeyBackup/Banners/KeyBackupBannerCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,26 +18,26 @@
                 <rect key="frame" x="0.0" y="0.0" width="651" height="80.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="key_backup_logo" translatesAutoresizingMaskIntoConstraints="NO" id="9tN-7x-mQY">
-                        <rect key="frame" x="20" y="27.5" width="27" height="26"/>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="secrets_setup_key" translatesAutoresizingMaskIntoConstraints="NO" id="9tN-7x-mQY">
+                        <rect key="frame" x="20" y="24.5" width="32" height="32"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="27" id="34F-3o-CxQ"/>
-                            <constraint firstAttribute="height" constant="26" id="bJn-O7-2r8"/>
+                            <constraint firstAttribute="width" constant="32" id="34F-3o-CxQ"/>
+                            <constraint firstAttribute="width" secondItem="9tN-7x-mQY" secondAttribute="height" multiplier="1:1" id="Anh-L2-mpZ"/>
                         </constraints>
                     </imageView>
                     <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="YjT-XC-M1w">
-                        <rect key="frame" x="72" y="15" width="517" height="50.5"/>
+                        <rect key="frame" x="77" y="15" width="512" height="50.5"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Never lose encrypted messages" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Rt-ER-z7l">
-                                <rect key="frame" x="0.0" y="0.0" width="517" height="18"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Secure Backup" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Rt-ER-z7l">
+                                <rect key="frame" x="0.0" y="0.0" width="512" height="24"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Start using Key Backup" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yvG-ND-8Ms">
-                                <rect key="frame" x="0.0" y="20" width="517" height="30.5"/>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
-                                <color key="textColor" red="0.47843137250000001" green="0.78823529410000004" blue="0.63137254899999995" alpha="1" colorSpace="calibratedRGB"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Safeguard against losing access to encrypted messages &amp; data" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yvG-ND-8Ms">
+                                <rect key="frame" x="0.0" y="26" width="512" height="24.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
@@ -79,6 +79,6 @@
     </objects>
     <resources>
         <image name="close_banner" width="10" height="10"/>
-        <image name="key_backup_logo" width="48" height="46"/>
+        <image name="secrets_setup_key" width="48" height="48"/>
     </resources>
 </document>