diff --git a/Adamant-ios.xcodeproj/project.pbxproj b/Adamant-ios.xcodeproj/project.pbxproj
index 883bf8328..7642227a6 100644
--- a/Adamant-ios.xcodeproj/project.pbxproj
+++ b/Adamant-ios.xcodeproj/project.pbxproj
@@ -138,8 +138,6 @@
 				E9E7CD9020026FA100DFC4DB /* SwinjectDependencies.swift */,
 				E913C8F31FFFA51D001A83F7 /* ViewController.swift */,
 				E913C8F51FFFA51D001A83F7 /* Main.storyboard */,
-				E913C8F81FFFA51D001A83F7 /* Assets.xcassets */,
-				E913C8FA1FFFA51D001A83F7 /* LaunchScreen.storyboard */,
 				E913C8FD1FFFA51E001A83F7 /* Info.plist */,
 			);
 			path = "Adamant-ios";
@@ -188,17 +186,9 @@
 		E913C9111FFFAB05001A83F7 /* Assets */ = {
 			isa = PBXGroup;
 			children = (
-				E91947A3200010DD001362F8 /* Exo+2_100_normal.ttf */,
-				E91947A4200010DE001362F8 /* Exo+2_300_normal.ttf */,
-				E919479F200010DC001362F8 /* Exo+2_400_italic.ttf */,
-				E91947A8200010DF001362F8 /* Exo+2_400_normal.ttf */,
-				E91947A9200010E0001362F8 /* Exo+2_500_normal.ttf */,
-				E91947A2200010DD001362F8 /* Exo+2_700_normal.ttf */,
-				E91947A0200010DC001362F8 /* Roboto_300_normal.ttf */,
-				E91947A1200010DD001362F8 /* Roboto_400_italic.ttf */,
-				E91947A6200010DF001362F8 /* Roboto_400_normal.ttf */,
-				E91947A5200010DE001362F8 /* Roboto_500_normal.ttf */,
-				E91947A7200010DF001362F8 /* Roboto_700_normal.ttf */,
+				E9E7CDA42002A6EB00DFC4DB /* Fonts */,
+				E913C8FA1FFFA51D001A83F7 /* LaunchScreen.storyboard */,
+				E913C8F81FFFA51D001A83F7 /* Assets.xcassets */,
 				E913C9121FFFAB19001A83F7 /* adamant-core.js */,
 				E913C9141FFFAB58001A83F7 /* utilites.js */,
 			);
@@ -231,6 +221,24 @@
 			path = ServerResponses;
 			sourceTree = "<group>";
 		};
+		E9E7CDA42002A6EB00DFC4DB /* Fonts */ = {
+			isa = PBXGroup;
+			children = (
+				E91947A3200010DD001362F8 /* Exo+2_100_normal.ttf */,
+				E91947A4200010DE001362F8 /* Exo+2_300_normal.ttf */,
+				E919479F200010DC001362F8 /* Exo+2_400_italic.ttf */,
+				E91947A8200010DF001362F8 /* Exo+2_400_normal.ttf */,
+				E91947A9200010E0001362F8 /* Exo+2_500_normal.ttf */,
+				E91947A2200010DD001362F8 /* Exo+2_700_normal.ttf */,
+				E91947A0200010DC001362F8 /* Roboto_300_normal.ttf */,
+				E91947A1200010DD001362F8 /* Roboto_400_italic.ttf */,
+				E91947A6200010DF001362F8 /* Roboto_400_normal.ttf */,
+				E91947A5200010DE001362F8 /* Roboto_500_normal.ttf */,
+				E91947A7200010DF001362F8 /* Roboto_700_normal.ttf */,
+			);
+			path = Fonts;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
diff --git a/Adamant-ios/Assets.xcassets/Adamant_Logo_big.imageset/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/Contents.json
similarity index 100%
rename from Adamant-ios/Assets.xcassets/Adamant_Logo_big.imageset/Contents.json
rename to Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/Contents.json
diff --git a/Adamant-ios/Assets.xcassets/Adamant_Logo_big.imageset/adamant-logo-1024x1024.png b/Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/adamant-logo-1024x1024.png
similarity index 100%
rename from Adamant-ios/Assets.xcassets/Adamant_Logo_big.imageset/adamant-logo-1024x1024.png
rename to Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/adamant-logo-1024x1024.png
diff --git a/Adamant-ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 53%
rename from Adamant-ios/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json
index d8db8d65f..68f48bf8b 100644
--- a/Adamant-ios/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,93 +1,57 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "adamant-20@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "adamant-20@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "adamant-29@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "adamant-29@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "adamant-40@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "adamant-40@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "adamant-60@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "adamant-60@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "adamant-1024.png",
       "scale" : "1x"
     }
   ],
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-1024.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-1024.png
new file mode 100644
index 000000000..da53ead79
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-1024.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-20@2x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-20@2x.png
new file mode 100644
index 000000000..6c36dcfc2
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-20@2x.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-20@3x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-20@3x.png
new file mode 100644
index 000000000..de0a48ad1
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-20@3x.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-29@2x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-29@2x.png
new file mode 100644
index 000000000..01d6c307e
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-29@2x.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-29@3x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-29@3x.png
new file mode 100644
index 000000000..d57747591
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-29@3x.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-40@2x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-40@2x.png
new file mode 100644
index 000000000..3f2ed7fde
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-40@2x.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-40@3x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-40@3x.png
new file mode 100644
index 000000000..9dcdec3de
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-40@3x.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-60@2x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-60@2x.png
new file mode 100644
index 000000000..9dcdec3de
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-60@2x.png differ
diff --git a/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-60@3x.png b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-60@3x.png
new file mode 100644
index 000000000..e8fccc474
Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/AppIcon.appiconset/adamant-60@3x.png differ
diff --git a/Adamant-ios/Assets.xcassets/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Contents.json
similarity index 100%
rename from Adamant-ios/Assets.xcassets/Contents.json
rename to Adamant-ios/Assets/Assets.xcassets/Contents.json
diff --git a/Adamant-ios/Assets/Base.lproj/LaunchScreen.storyboard b/Adamant-ios/Assets/Base.lproj/LaunchScreen.storyboard
new file mode 100644
index 000000000..39ed2d8e2
--- /dev/null
+++ b/Adamant-ios/Assets/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Adamant_Logo_big" translatesAutoresizingMaskIntoConstraints="NO" id="QFi-yD-WfI">
+                                <rect key="frame" x="75.5" y="231.5" width="225" height="225"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="QFi-yD-WfI" secondAttribute="height" multiplier="1:1" id="1aK-Eg-xSX"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="QFi-yD-WfI" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="Aj7-Tp-RFa"/>
+                            <constraint firstItem="QFi-yD-WfI" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="0.6" id="VhX-8V-nXU"/>
+                            <constraint firstItem="QFi-yD-WfI" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="mGW-pQ-edp"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="52" y="374.66266866566718"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="Adamant_Logo_big" width="1024" height="1024"/>
+    </resources>
+</document>
diff --git a/Adamant-ios/Assets/Exo+2_100_normal.ttf b/Adamant-ios/Assets/Fonts/Exo+2_100_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Exo+2_100_normal.ttf
rename to Adamant-ios/Assets/Fonts/Exo+2_100_normal.ttf
diff --git a/Adamant-ios/Assets/Exo+2_300_normal.ttf b/Adamant-ios/Assets/Fonts/Exo+2_300_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Exo+2_300_normal.ttf
rename to Adamant-ios/Assets/Fonts/Exo+2_300_normal.ttf
diff --git a/Adamant-ios/Assets/Exo+2_400_italic.ttf b/Adamant-ios/Assets/Fonts/Exo+2_400_italic.ttf
similarity index 100%
rename from Adamant-ios/Assets/Exo+2_400_italic.ttf
rename to Adamant-ios/Assets/Fonts/Exo+2_400_italic.ttf
diff --git a/Adamant-ios/Assets/Exo+2_400_normal.ttf b/Adamant-ios/Assets/Fonts/Exo+2_400_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Exo+2_400_normal.ttf
rename to Adamant-ios/Assets/Fonts/Exo+2_400_normal.ttf
diff --git a/Adamant-ios/Assets/Exo+2_500_normal.ttf b/Adamant-ios/Assets/Fonts/Exo+2_500_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Exo+2_500_normal.ttf
rename to Adamant-ios/Assets/Fonts/Exo+2_500_normal.ttf
diff --git a/Adamant-ios/Assets/Exo+2_700_normal.ttf b/Adamant-ios/Assets/Fonts/Exo+2_700_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Exo+2_700_normal.ttf
rename to Adamant-ios/Assets/Fonts/Exo+2_700_normal.ttf
diff --git a/Adamant-ios/Assets/Roboto_300_normal.ttf b/Adamant-ios/Assets/Fonts/Roboto_300_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Roboto_300_normal.ttf
rename to Adamant-ios/Assets/Fonts/Roboto_300_normal.ttf
diff --git a/Adamant-ios/Assets/Roboto_400_italic.ttf b/Adamant-ios/Assets/Fonts/Roboto_400_italic.ttf
similarity index 100%
rename from Adamant-ios/Assets/Roboto_400_italic.ttf
rename to Adamant-ios/Assets/Fonts/Roboto_400_italic.ttf
diff --git a/Adamant-ios/Assets/Roboto_400_normal.ttf b/Adamant-ios/Assets/Fonts/Roboto_400_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Roboto_400_normal.ttf
rename to Adamant-ios/Assets/Fonts/Roboto_400_normal.ttf
diff --git a/Adamant-ios/Assets/Roboto_500_normal.ttf b/Adamant-ios/Assets/Fonts/Roboto_500_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Roboto_500_normal.ttf
rename to Adamant-ios/Assets/Fonts/Roboto_500_normal.ttf
diff --git a/Adamant-ios/Assets/Roboto_700_normal.ttf b/Adamant-ios/Assets/Fonts/Roboto_700_normal.ttf
similarity index 100%
rename from Adamant-ios/Assets/Roboto_700_normal.ttf
rename to Adamant-ios/Assets/Fonts/Roboto_700_normal.ttf
diff --git a/Adamant-ios/Base.lproj/LaunchScreen.storyboard b/Adamant-ios/Base.lproj/LaunchScreen.storyboard
deleted file mode 100644
index f83f6fd58..000000000
--- a/Adamant-ios/Base.lproj/LaunchScreen.storyboard
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>
diff --git a/Adamant-ios/Info.plist b/Adamant-ios/Info.plist
index d3e2dfaf9..a02cf57a9 100644
--- a/Adamant-ios/Info.plist
+++ b/Adamant-ios/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Adamant</string>
+	<string>ADAMANT</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>