diff --git a/Stepic.xcodeproj/xcuserdata/Ostrenkiy.xcuserdatad/xcschemes/xcschememanagement.plist b/Stepic.xcodeproj/xcuserdata/Ostrenkiy.xcuserdatad/xcschemes/xcschememanagement.plist
index 6b0b17e480..3b2235ce1e 100644
--- a/Stepic.xcodeproj/xcuserdata/Ostrenkiy.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Stepic.xcodeproj/xcuserdata/Ostrenkiy.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -122,7 +122,7 @@
 		<key>StepikTV.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>90</integer>
+			<integer>92</integer>
 		</dict>
 		<key>StickerPackExtension.xcscheme</key>
 		<dict>
diff --git a/Stepic/Base.lproj/LaunchScreen.xib b/Stepic/Base.lproj/LaunchScreen.xib
index 86935dae41..845281adad 100644
--- a/Stepic/Base.lproj/LaunchScreen.xib
+++ b/Stepic/Base.lproj/LaunchScreen.xib
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="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="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -12,14 +15,14 @@
             <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="stepic_logotype_square_green" translatesAutoresizingMaskIntoConstraints="NO" id="iJa-tg-pbs">
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stepik_logotype_square_black" translatesAutoresizingMaskIntoConstraints="NO" id="iJa-tg-pbs">
                     <rect key="frame" x="20" y="20" width="440" height="440"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="iJa-tg-pbs" secondAttribute="height" multiplier="1:1" id="L12-FO-K66"/>
                     </constraints>
                 </imageView>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="iJa-tg-pbs" secondAttribute="bottom" constant="20" symbolic="YES" id="0f6-0N-YxR"/>
                 <constraint firstItem="iJa-tg-pbs" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="7v9-uo-AZb"/>
@@ -32,6 +35,6 @@
         </view>
     </objects>
     <resources>
-        <image name="stepic_logotype_square_green" width="1000" height="1000"/>
+        <image name="stepik_logotype_square_black" width="1000" height="1000"/>
     </resources>
 </document>
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Contents.json b/Stepic/Images.xcassets/AppIcon.appiconset/Contents.json
index efb9fad734..191d433565 100644
--- a/Stepic/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Stepic/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,149 +1,178 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-20x20@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-29.png",
+      "filename" : "Icon-App-29x29@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-29@2x.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-29@3x.png",
+      "filename" : "Icon-App-29x29@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-40@2x.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "Icon-40@3x.png",
+      "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "57x57",
       "idiom" : "iphone",
-      "filename" : "Icon-57.png",
+      "filename" : "Icon-App-57x57@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "57x57",
       "idiom" : "iphone",
-      "filename" : "Icon-57@2x.png",
+      "filename" : "Icon-App-57x57@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "Icon-60@2x.png",
+      "filename" : "Icon-App-60x60@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "Icon-60@3x.png",
+      "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@1x.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "ipad",
       "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-29_2.png",
+      "filename" : "Icon-App-29x29@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "Icon-29_2@2x.png",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-40.png",
+      "filename" : "Icon-App-40x40@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "Icon-40_2@2x.png",
+      "filename" : "Icon-App-40x40@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "50x50",
       "idiom" : "ipad",
-      "filename" : "Icon-50.png",
+      "filename" : "Icon-Small-50x50@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "50x50",
       "idiom" : "ipad",
-      "filename" : "Icon-50@2x.png",
+      "filename" : "Icon-Small-50x50@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "72x72",
       "idiom" : "ipad",
-      "filename" : "Icon-72.png",
+      "filename" : "Icon-App-72x72@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "72x72",
       "idiom" : "ipad",
-      "filename" : "Icon-72@2x.png",
+      "filename" : "Icon-App-72x72@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76.png",
+      "filename" : "Icon-App-76x76@1x.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
+      "filename" : "Icon-App-76x76@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "Icon-83.5@2x.png",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "ItunesArtwork@2x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@1x.png",
       "scale" : "1x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29.png
deleted file mode 100644
index a4b476aba8..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png
deleted file mode 100644
index 3a475f243b..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png
deleted file mode 100644
index 6752071549..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29_2.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29_2.png
deleted file mode 100644
index a4b476aba8..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29_2.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29_2@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29_2@2x.png
deleted file mode 100644
index 3a475f243b..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-29_2@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40.png
deleted file mode 100644
index 0cf4f8ef61..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
deleted file mode 100644
index bd513e26a0..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
deleted file mode 100644
index acbae9bc8d..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40_2@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40_2@2x.png
deleted file mode 100644
index bd513e26a0..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-40_2@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-50.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-50.png
deleted file mode 100644
index a6330f6bc8..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-50.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-50@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-50@2x.png
deleted file mode 100644
index 7db6a1628b..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-50@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-57.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-57.png
deleted file mode 100644
index babec2673f..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-57.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-57@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-57@2x.png
deleted file mode 100644
index 16824b6bd9..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-57@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
deleted file mode 100644
index acbae9bc8d..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
deleted file mode 100644
index 2418ad7031..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-72.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-72.png
deleted file mode 100644
index d6f35802ea..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-72.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png
deleted file mode 100644
index eaddcc9cf1..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-76.png
deleted file mode 100644
index 971a0f971d..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-76.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png
deleted file mode 100644
index 9a6a9beb1e..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
deleted file mode 100644
index c028c3d3df..0000000000
Binary files a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png and /dev/null differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 0000000000..6555a6694a
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 0000000000..e0446c5508
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 0000000000..017eadae46
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 0000000000..0470b99197
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 0000000000..c350e33376
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 0000000000..bdae08e09d
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 0000000000..e0446c5508
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
new file mode 100644
index 0000000000..3327bf19e5
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 0000000000..960c7b02fe
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 0000000000..d58fde0767
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 0000000000..0a1cab8267
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png
new file mode 100644
index 0000000000..017eadae46
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
new file mode 100644
index 0000000000..960c7b02fe
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
new file mode 100644
index 0000000000..727296bcf2
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
new file mode 100644
index 0000000000..319050e660
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
new file mode 100644
index 0000000000..1c0eb49f8a
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 0000000000..aefeb3ecb5
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 0000000000..0f34cea2d1
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png
new file mode 100644
index 0000000000..6db2a76a1d
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@3x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 0000000000..2227ba763b
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png
new file mode 100644
index 0000000000..938440bc40
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-Small-50x50@1x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png
new file mode 100644
index 0000000000..1f5cab36bc
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/Icon-Small-50x50@2x.png differ
diff --git a/Stepic/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/Stepic/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png
new file mode 100644
index 0000000000..73c060833f
Binary files /dev/null and b/Stepic/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png differ
diff --git a/Stepic/Images.xcassets/stepik_logotype_square_black.imageset/Contents.json b/Stepic/Images.xcassets/stepik_logotype_square_black.imageset/Contents.json
new file mode 100644
index 0000000000..680c69d74a
--- /dev/null
+++ b/Stepic/Images.xcassets/stepik_logotype_square_black.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "stepik_logotype_square_black.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Stepic/Images.xcassets/stepik_logotype_square_black.imageset/stepik_logotype_square_black.png b/Stepic/Images.xcassets/stepik_logotype_square_black.imageset/stepik_logotype_square_black.png
new file mode 100644
index 0000000000..e34cc17e02
Binary files /dev/null and b/Stepic/Images.xcassets/stepik_logotype_square_black.imageset/stepik_logotype_square_black.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Contents.json b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Contents.json
index f8133536ee..bd251be8fb 100644
--- a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -3,7 +3,7 @@
     {
       "size" : "24x24",
       "idiom" : "watch",
-      "filename" : "rsz_icon-603x.png",
+      "filename" : "Icon-24@2x.png",
       "scale" : "2x",
       "role" : "notificationCenter",
       "subtype" : "38mm"
@@ -11,7 +11,7 @@
     {
       "size" : "27.5x27.5",
       "idiom" : "watch",
-      "filename" : "rsz_1icon-603x.png",
+      "filename" : "Icon-27.5@2x.png",
       "scale" : "2x",
       "role" : "notificationCenter",
       "subtype" : "42mm"
@@ -38,10 +38,18 @@
       "role" : "appLauncher",
       "subtype" : "38mm"
     },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "filename" : "Icon-44@2x.png",
+      "scale" : "2x",
+      "role" : "longLook",
+      "subtype" : "42mm"
+    },
     {
       "size" : "86x86",
       "idiom" : "watch",
-      "filename" : "rsz_icon-1024.png",
+      "filename" : "Icon-86@2x.png",
       "scale" : "2x",
       "role" : "quickLook",
       "subtype" : "38mm"
@@ -49,10 +57,15 @@
     {
       "size" : "98x98",
       "idiom" : "watch",
-      "filename" : "rsz_1icon-1024.png",
+      "filename" : "Icon-98@2x.png",
       "scale" : "2x",
       "role" : "quickLook",
       "subtype" : "42mm"
+    },
+    {
+      "idiom" : "watch-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png
new file mode 100644
index 0000000000..98b4dc52f4
Binary files /dev/null and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png
new file mode 100644
index 0000000000..016adf63ad
Binary files /dev/null and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png
index 3a475f243b..c350e33376 100644
Binary files a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png
index 6752071549..bdae08e09d 100644
Binary files a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png
index bd513e26a0..3327bf19e5 100644
Binary files a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png
new file mode 100644
index 0000000000..2ad5c3eb18
Binary files /dev/null and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png
new file mode 100644
index 0000000000..c94b39e68a
Binary files /dev/null and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png
new file mode 100644
index 0000000000..f98daa88d5
Binary files /dev/null and b/StepicWatch/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_1icon-1024.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_1icon-1024.png
deleted file mode 100644
index fb0f2ff995..0000000000
Binary files a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_1icon-1024.png and /dev/null differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_1icon-603x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_1icon-603x.png
deleted file mode 100644
index ae7ad588c8..0000000000
Binary files a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_1icon-603x.png and /dev/null differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_icon-1024.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_icon-1024.png
deleted file mode 100644
index 58fb23399a..0000000000
Binary files a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_icon-1024.png and /dev/null differ
diff --git a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_icon-603x.png b/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_icon-603x.png
deleted file mode 100644
index fa26ec32df..0000000000
Binary files a/StepicWatch/Assets.xcassets/AppIcon.appiconset/rsz_icon-603x.png and /dev/null differ
diff --git a/StepicWatch/Assets.xcassets/Icon-40.imageset/Contents.json b/StepicWatch/Assets.xcassets/Icon-40.imageset/Contents.json
index ead2eb2b6d..681aa1c19a 100644
--- a/StepicWatch/Assets.xcassets/Icon-40.imageset/Contents.json
+++ b/StepicWatch/Assets.xcassets/Icon-40.imageset/Contents.json
@@ -1,9 +1,17 @@
 {
   "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "Icon-40@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json
index 16f7ae000f..8917e69640 100644
--- a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json	
+++ b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/Contents.json	
@@ -3,59 +3,59 @@
     {
       "size" : "60x45",
       "idiom" : "iphone",
-      "filename" : "iMessage Icon 60x45@2x.png",
+      "filename" : "icon-messages-app-iPhone-60x45@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x45",
       "idiom" : "iphone",
-      "filename" : "iMessage Icon 60x45@3x.png",
+      "filename" : "icon-messages-app-iPhone-60x45@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "67x50",
       "idiom" : "ipad",
-      "filename" : "iMessage Icon 67x50@2x.png",
+      "filename" : "icon-messages-app-iPadAir-67x50@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "74x55",
       "idiom" : "ipad",
-      "filename" : "iMessage Icon 74x55@2x.png",
+      "filename" : "icon-messages-app-iPadAir-74x55@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "27x20",
       "idiom" : "universal",
-      "filename" : "iMessage Icon 27x20@2x.png",
+      "filename" : "icon-messages-app-27x20@2x.png",
       "scale" : "2x",
       "platform" : "ios"
     },
     {
       "size" : "27x20",
       "idiom" : "universal",
-      "filename" : "iMessage Icon 27x20@3x.png",
+      "filename" : "icon-messages-app-27x20@3x.png",
       "scale" : "3x",
       "platform" : "ios"
     },
     {
       "size" : "32x24",
       "idiom" : "universal",
-      "filename" : "iMessage Icon 32x24@2x.png",
+      "filename" : "icon-messages-transcript-32x24@2x.png",
       "scale" : "2x",
       "platform" : "ios"
     },
     {
       "size" : "32x24",
       "idiom" : "universal",
-      "filename" : "iMessage Icon 32x24@3x.png",
+      "filename" : "icon-messages-transcript-32x24@3x.png",
       "scale" : "3x",
       "platform" : "ios"
     },
     {
       "size" : "1024x768",
       "idiom" : "ios-marketing",
-      "filename" : "iMessage Icon 1024x768.png",
+      "filename" : "icon-messages-app-store-1024x768.png",
       "scale" : "1x",
       "platform" : "ios"
     }
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 1024x768.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 1024x768.png
deleted file mode 100644
index a0d130bafb..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 1024x768.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 27x20@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 27x20@2x.png
deleted file mode 100644
index 070dc4dd55..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 27x20@2x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 27x20@3x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 27x20@3x.png
deleted file mode 100644
index 6705f6aa07..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 27x20@3x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 32x24@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 32x24@2x.png
deleted file mode 100644
index a44e078e8d..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 32x24@2x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 32x24@3x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 32x24@3x.png
deleted file mode 100644
index 696c5f9c18..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 32x24@3x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 60x45@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 60x45@2x.png
deleted file mode 100644
index 44fe645e85..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 60x45@2x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 60x45@3x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 60x45@3x.png
deleted file mode 100644
index 6d7e1baa04..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 60x45@3x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 67x50@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 67x50@2x.png
deleted file mode 100644
index cf077cb558..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 67x50@2x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 74x55@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 74x55@2x.png
deleted file mode 100644
index 55099184fd..0000000000
Binary files a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/iMessage Icon 74x55@2x.png and /dev/null differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-27x20@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-27x20@2x.png
new file mode 100644
index 0000000000..590195bfae
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-27x20@2x.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-27x20@3x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-27x20@3x.png
new file mode 100644
index 0000000000..a6bfba1137
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-27x20@3x.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPadAir-67x50@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPadAir-67x50@2x.png
new file mode 100644
index 0000000000..a5c90ee228
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPadAir-67x50@2x.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPadAir-74x55@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPadAir-74x55@2x.png
new file mode 100644
index 0000000000..817bd06a88
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPadAir-74x55@2x.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPhone-60x45@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPhone-60x45@2x.png
new file mode 100644
index 0000000000..7380502853
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPhone-60x45@2x.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPhone-60x45@3x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPhone-60x45@3x.png
new file mode 100644
index 0000000000..5c5178c384
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-iPhone-60x45@3x.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-store-1024x768.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-store-1024x768.png
new file mode 100644
index 0000000000..5b0926523d
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-app-store-1024x768.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-transcript-32x24@2x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-transcript-32x24@2x.png
new file mode 100644
index 0000000000..f89a3524e2
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-transcript-32x24@2x.png differ
diff --git a/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-transcript-32x24@3x.png b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-transcript-32x24@3x.png
new file mode 100644
index 0000000000..a24bf23710
Binary files /dev/null and b/StickerPackExtension/Stickers.xcassets/iMessage App Icon.stickersiconset/icon-messages-transcript-32x24@3x.png differ