diff --git a/Vector/Assets/Images/Icon-170.png b/Vector/Assets/Images/Icon-170.png
new file mode 100644
index 000000000..c16e3e955
Binary files /dev/null and b/Vector/Assets/Images/Icon-170.png differ
diff --git a/Vector/Assets/Images/Icon-170@2x.png b/Vector/Assets/Images/Icon-170@2x.png
new file mode 100644
index 000000000..11847eb62
Binary files /dev/null and b/Vector/Assets/Images/Icon-170@2x.png differ
diff --git a/Vector/Assets/Images/Icon-170@3x.png b/Vector/Assets/Images/Icon-170@3x.png
new file mode 100644
index 000000000..b5723b594
Binary files /dev/null and b/Vector/Assets/Images/Icon-170@3x.png differ
diff --git a/Vector/Base.lproj/LaunchScreen.xib b/Vector/Base.lproj/LaunchScreen.xib
index 1c5994db0..488d1dcc7 100644
--- a/Vector/Base.lproj/LaunchScreen.xib
+++ b/Vector/Base.lproj/LaunchScreen.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D131" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -12,31 +12,34 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 vector.im. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright (c) 2016 vector.im. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="441" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Vector" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Icon-170.png" translatesAutoresizingMaskIntoConstraints="NO" id="Hgr-Cr-V9J">
+                    <rect key="frame" x="155" y="95" width="170" height="170"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="170" id="5Zj-bp-AUm"/>
+                        <constraint firstAttribute="height" constant="170" id="Tdf-bg-MD6"/>
+                    </constraints>
+                </imageView>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
                 <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
                 <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+                <constraint firstItem="Hgr-Cr-V9J" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" multiplier="3:4" id="Sam-xb-UUQ"/>
                 <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+                <constraint firstItem="Hgr-Cr-V9J" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="ovQ-If-NnA"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <point key="canvasLocation" x="548" y="455"/>
         </view>
     </objects>
+    <resources>
+        <image name="Icon-170.png" width="170" height="170"/>
+    </resources>
 </document>
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Contents.json b/Vector/Images.xcassets/AppIcon.appiconset/Contents.json
index 36d2c80d8..07f4215a9 100644
--- a/Vector/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Vector/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,63 +1,81 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-29@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-29@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-40@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-40@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-60@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-29.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-29@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-40.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-40@2x-1.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-83.5@2x.png",
       "scale" : "2x"
     }
   ],
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-29.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29.png
new file mode 100644
index 000000000..94d457f96
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png
new file mode 100644
index 000000000..1a2dc0062
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png
new file mode 100644
index 000000000..1a2dc0062
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png
new file mode 100644
index 000000000..19b939ac7
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-40.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 000000000..62c161382
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png
new file mode 100644
index 000000000..8c8d8e83a
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
new file mode 100644
index 000000000..8c8d8e83a
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
new file mode 100644
index 000000000..efd26b001
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
new file mode 100644
index 000000000..efd26b001
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
new file mode 100644
index 000000000..f2374497d
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-76.png
new file mode 100644
index 000000000..6ac1c8210
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
new file mode 100644
index 000000000..b0dbb713f
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ
diff --git a/Vector/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Vector/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
new file mode 100644
index 000000000..6cc38abd7
Binary files /dev/null and b/Vector/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ