diff --git a/assets/base/release/icons/ios/20@2x-1.png b/assets/base/release/icons/ios/20@2x-1.png
deleted file mode 100644
index de462bba3..000000000
Binary files a/assets/base/release/icons/ios/20@2x-1.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/29@2x-1.png b/assets/base/release/icons/ios/29@2x-1.png
deleted file mode 100644
index 595923020..000000000
Binary files a/assets/base/release/icons/ios/29@2x-1.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/40@2x-1.png b/assets/base/release/icons/ios/40@2x-1.png
deleted file mode 100644
index c7e830b8f..000000000
Binary files a/assets/base/release/icons/ios/40@2x-1.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/Icon-60.png b/assets/base/release/icons/ios/Icon-60.png
deleted file mode 100644
index efd833555..000000000
Binary files a/assets/base/release/icons/ios/Icon-60.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/Icon-72.png b/assets/base/release/icons/ios/Icon-72.png
deleted file mode 100644
index 2fef51dba..000000000
Binary files a/assets/base/release/icons/ios/Icon-72.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/Icon-72@2x.png b/assets/base/release/icons/ios/Icon-72@2x.png
deleted file mode 100644
index c82a0c09b..000000000
Binary files a/assets/base/release/icons/ios/Icon-72@2x.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/Icon-Small-50.png b/assets/base/release/icons/ios/Icon-Small-50.png
deleted file mode 100644
index 067d9a1d3..000000000
Binary files a/assets/base/release/icons/ios/Icon-Small-50.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/Icon-Small-50@2x.png b/assets/base/release/icons/ios/Icon-Small-50@2x.png
deleted file mode 100644
index d06adbd64..000000000
Binary files a/assets/base/release/icons/ios/Icon-Small-50@2x.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/Icon.png b/assets/base/release/icons/ios/Icon.png
deleted file mode 100644
index 1693613e7..000000000
Binary files a/assets/base/release/icons/ios/Icon.png and /dev/null differ
diff --git a/assets/base/release/icons/ios/Icon@2x.png b/assets/base/release/icons/ios/Icon@2x.png
deleted file mode 100644
index 9fa4e4854..000000000
Binary files a/assets/base/release/icons/ios/Icon@2x.png and /dev/null differ
diff --git a/assets/base/release/splash_screen/android/drawable-hdpi/splash.png b/assets/base/release/splash_screen/android/drawable-hdpi/splash.png
new file mode 100755
index 000000000..f1111ecf2
Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-hdpi/splash.png differ
diff --git a/assets/base/release/splash_screen/android/drawable-mdpi/splash.png b/assets/base/release/splash_screen/android/drawable-mdpi/splash.png
new file mode 100755
index 000000000..2c5688be9
Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-mdpi/splash.png differ
diff --git a/assets/base/release/splash_screen/android/drawable-xhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-xhdpi/splash.png
new file mode 100755
index 000000000..c1f7c659e
Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-xhdpi/splash.png differ
diff --git a/assets/base/release/splash_screen/android/drawable-xxhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-xxhdpi/splash.png
new file mode 100755
index 000000000..d422667df
Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-xxhdpi/splash.png differ
diff --git a/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash.png b/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash.png
new file mode 100755
index 000000000..1a06e611e
Binary files /dev/null and b/assets/base/release/splash_screen/android/drawable-xxxhdpi/splash.png differ
diff --git a/assets/base/release/splash_screen/android/layout/launch_screen.xml b/assets/base/release/splash_screen/android/layout/launch_screen.xml
new file mode 100644
index 000000000..8e2032943
--- /dev/null
+++ b/assets/base/release/splash_screen/android/layout/launch_screen.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.percent.PercentRelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffffff"
+    android:gravity="center_horizontal"
+    tools:context=".SplashScreenActivity">
+
+    <ImageView
+        android:id="@+id/imgLogo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:src="@drawable/splash" />
+
+</android.support.percent.PercentRelativeLayout>
diff --git a/assets/base/release/splash_screen/ios/LaunchScreen.xib b/assets/base/release/splash_screen/ios/LaunchScreen.xib
new file mode 100644
index 000000000..3f4e3496e
--- /dev/null
+++ b/assets/base/release/splash_screen/ios/LaunchScreen.xib
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splash.png" translatesAutoresizingMaskIntoConstraints="NO" id="ZkI-RL-69Z">
+                    <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+                </imageView>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="ZkI-RL-69Z" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="7dE-9J-TdO"/>
+                <constraint firstAttribute="trailing" secondItem="ZkI-RL-69Z" secondAttribute="trailing" id="KFm-od-sbN"/>
+                <constraint firstAttribute="bottom" secondItem="ZkI-RL-69Z" secondAttribute="bottom" id="afY-hI-KgI"/>
+                <constraint firstItem="ZkI-RL-69Z" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="eMX-qT-GeJ"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="548" y="455"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="splash.png" width="720" height="1280"/>
+    </resources>
+</document>
diff --git a/assets/base/release/splash_screen/ios/splash.png b/assets/base/release/splash_screen/ios/splash.png
new file mode 100644
index 000000000..1998ef106
Binary files /dev/null and b/assets/base/release/splash_screen/ios/splash.png differ
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c85766a1e..fb3387545 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -128,6 +128,7 @@ platform :ios do
   def replace_ios_assets()
     if ENV['IOS_REPLACE_ASSETS'] == 'true'
       sh 'cp -R ../dist/assets/release/icons/ios/* ../ios/Mattermost/Images.xcassets/AppIcon.appiconset/'
+      sh 'cp -R ../dist/assets/release/splash_screen/ios/* ../ios/SplashScreenResource/*'
     end
   end
 
@@ -302,6 +303,7 @@ platform :android do
 
     if ENV['ANDROID_REPLACE_ASSETS'] == 'true'
       sh 'cp -R ../dist/assets/release/icons/android/* ../android/app/src/main/res/'
+      sh 'cp -R ../dist/assets/release/splash_screen/android/* ../android/app/src/main/res/'
     end
 
     if packageId != 'com.mattermost.rnbeta'
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x-1.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x-1.png
deleted file mode 100644
index 9eff5130e..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/20@2x-1.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x-1.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x-1.png
deleted file mode 100644
index 52b6fecc4..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/29@2x-1.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x-1.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x-1.png
deleted file mode 100644
index b2200b15a..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/40@2x-1.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json
index 12cb73cc0..d5d17a7df 100644
--- a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -57,7 +57,7 @@
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "20@2x-1.png",
+      "filename" : "20@2x.png",
       "scale" : "2x"
     },
     {
@@ -69,7 +69,7 @@
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "29@2x-1.png",
+      "filename" : "29@2x.png",
       "scale" : "2x"
     },
     {
@@ -81,7 +81,7 @@
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "40@2x-1.png",
+      "filename" : "40@2x.png",
       "scale" : "2x"
     },
     {
@@ -113,4 +113,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
\ No newline at end of file
+}
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60.png
deleted file mode 100644
index 7a3faf54d..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-60.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72.png
deleted file mode 100644
index 2f8795e93..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png
deleted file mode 100644
index 0eda645e7..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png
deleted file mode 100644
index afb064df8..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png
deleted file mode 100644
index e610ab903..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon.png
deleted file mode 100644
index 1bde4de8b..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon.png and /dev/null differ
diff --git a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon@2x.png b/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon@2x.png
deleted file mode 100644
index ad963231f..000000000
Binary files a/ios/Mattermost/Images.xcassets/AppIcon.appiconset/Icon@2x.png and /dev/null differ