Update icons

17 files changed, 228 insertions, 96 deletions

diff --git a/Juick/AppDelegate.m b/Juick/AppDelegate.m
index f1afdc1..b3f544c 100644
--- a/Juick/AppDelegate.m
+++ b/Juick/AppDelegate.m
@@ -16,7 +16,7 @@
 #import "User.h"
 #import "DeviceRegistration.h"
 #import "NewPostViewController.h"
-#import "DiscoverViewController.h"
+#import "FeedViewController.h"
 
 @interface AppDelegate()
 -(void) parseNotificationPayload:(NSDictionary *)userInfo;
diff --git a/Juick/Images.xcassets/ei-navicon.imageset/Contents.json b/Juick/Images.xcassets/ei-bell.imageset/Contents.json
index b3ccd62..8700d53 100644
--- a/Juick/Images.xcassets/ei-navicon.imageset/Contents.json
+++ b/Juick/Images.xcassets/ei-bell.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ei-navicon.pdf",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ei-bell.pdf"
     }
   ],
   "info" : {
diff --git a/Juick/Images.xcassets/ei-bell.imageset/ei-bell.pdf b/Juick/Images.xcassets/ei-bell.imageset/ei-bell.pdf
new file mode 100644
index 0000000..6475a0e
--- /dev/null
+++ b/Juick/Images.xcassets/ei-bell.imageset/ei-bell.pdf
diff --git a/Juick/Images.xcassets/ei-clock.imageset/Contents.json b/Juick/Images.xcassets/ei-clock.imageset/Contents.json
index 5bcd7f5..9ab4b4d 100644
--- a/Juick/Images.xcassets/ei-clock.imageset/Contents.json
+++ b/Juick/Images.xcassets/ei-clock.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ei-clock.pdf",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ei-clock.pdf"
     }
   ],
   "info" : {
diff --git a/Juick/Images.xcassets/ei-comment.imageset/Contents.json b/Juick/Images.xcassets/ei-comment.imageset/Contents.json
index 6ba09ec..3515f97 100644
--- a/Juick/Images.xcassets/ei-comment.imageset/Contents.json
+++ b/Juick/Images.xcassets/ei-comment.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ei-comment.pdf",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ei-comment.pdf"
     }
   ],
   "info" : {
diff --git a/Juick/Images.xcassets/ei-envelope.imageset/Contents.json b/Juick/Images.xcassets/ei-envelope.imageset/Contents.json
index 2bba839..6c8816c 100644
--- a/Juick/Images.xcassets/ei-envelope.imageset/Contents.json
+++ b/Juick/Images.xcassets/ei-envelope.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ei-envelope.pdf",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ei-envelope.pdf"
     }
   ],
   "info" : {
diff --git a/Juick/Images.xcassets/ei-gear.imageset/Contents.json b/Juick/Images.xcassets/ei-gear.imageset/Contents.json
new file mode 100644
index 0000000..1154fdc
--- /dev/null
+++ b/Juick/Images.xcassets/ei-gear.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ei-gear.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template",
+    "preserves-vector-representation" : true
+  }
+}
\ No newline at end of file
diff --git a/Juick/Images.xcassets/ei-gear.imageset/ei-gear.pdf b/Juick/Images.xcassets/ei-gear.imageset/ei-gear.pdf
new file mode 100644
index 0000000..ab634d0
--- /dev/null
+++ b/Juick/Images.xcassets/ei-gear.imageset/ei-gear.pdf
diff --git a/Juick/Images.xcassets/ei-heart.imageset/Contents.json b/Juick/Images.xcassets/ei-heart.imageset/Contents.json
index 07b3f90..6f2d978 100644
--- a/Juick/Images.xcassets/ei-heart.imageset/Contents.json
+++ b/Juick/Images.xcassets/ei-heart.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ei-heart.pdf",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ei-heart.pdf"
     }
   ],
   "info" : {
@@ -20,7 +11,6 @@
   },
   "properties" : {
     "template-rendering-intent" : "template",
-    "preserves-vector-representation" : true,
-    "auto-scaling" : "auto"
+    "preserves-vector-representation" : true
   }
 }
\ No newline at end of file
diff --git a/Juick/Images.xcassets/ei-heart.imageset/ei-heart.pdf b/Juick/Images.xcassets/ei-heart.imageset/ei-heart.pdf
index ec617c0..8aafcd3 100644
--- a/Juick/Images.xcassets/ei-heart.imageset/ei-heart.pdf
+++ b/Juick/Images.xcassets/ei-heart.imageset/ei-heart.pdf
diff --git a/Juick/Images.xcassets/ei-pencil.imageset/Contents.json b/Juick/Images.xcassets/ei-pencil.imageset/Contents.json
index 9d27319..346053c 100644
--- a/Juick/Images.xcassets/ei-pencil.imageset/Contents.json
+++ b/Juick/Images.xcassets/ei-pencil.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "ei-pencil.pdf",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ei-pencil.pdf"
     }
   ],
   "info" : {
diff --git a/Juick/Images.xcassets/ei-search.imageset/Contents.json b/Juick/Images.xcassets/ei-search.imageset/Contents.json
new file mode 100644
index 0000000..35807dd
--- /dev/null
+++ b/Juick/Images.xcassets/ei-search.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ei-search.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template",
+    "preserves-vector-representation" : true
+  }
+}
\ No newline at end of file
diff --git a/Juick/Images.xcassets/ei-navicon.imageset/ei-navicon.pdf b/Juick/Images.xcassets/ei-search.imageset/ei-search.pdf
index c0a7d57..6b57d81 100644
--- a/Juick/Images.xcassets/ei-navicon.imageset/ei-navicon.pdf
+++ b/Juick/Images.xcassets/ei-search.imageset/ei-search.pdf
diff --git a/Juick/Main.storyboard b/Juick/Main.storyboard
index e04800c..68df202 100644
--- a/Juick/Main.storyboard
+++ b/Juick/Main.storyboard
@@ -40,13 +40,15 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="woP-g5-FaQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-356.80000000000001" y="-964.31784107946032"/>
+            <point key="canvasLocation" x="1520.8" y="-964.76761619190415"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="NkO-CZ-YSO">
             <objects>
                 <navigationController id="k3X-uv-0IF" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" id="Qml-qG-fK2"/>
+                    <tabBarItem key="tabBarItem" title="" image="ei-clock" id="Qml-qG-fK2">
+                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                    </tabBarItem>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="3ze-yo-W7s">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -58,12 +60,12 @@
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fVV-xR-99a" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1856" y="-307.64617691154427"/>
+            <point key="canvasLocation" x="-809" y="-162"/>
         </scene>
-        <!--Discover View Controller-->
+        <!--Feed View Controller-->
         <scene sceneID="uvH-u9-x7X">
             <objects>
-                <tableViewController id="VCH-GK-jaH" customClass="DiscoverViewController" sceneMemberID="viewController">
+                <tableViewController id="VCH-GK-jaH" customClass="FeedViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="tbe-Zb-PfB">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -86,15 +88,12 @@
                             <outlet property="delegate" destination="VCH-GK-jaH" id="a3g-k1-u9r"/>
                         </connections>
                     </tableView>
-                    <tabBarItem key="tabBarItem" title="" image="nearby_icon" id="Je4-Zm-Zbu"/>
+                    <tabBarItem key="tabBarItem" title="" image="ei-clock" id="Je4-Zm-Zbu">
+                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                    </tabBarItem>
                     <toolbarItems/>
                     <navigationItem key="navigationItem" id="M2f-nV-K0C">
-                        <barButtonItem key="leftBarButtonItem" image="chats_icon" id="eaY-Yt-u9g">
-                            <connections>
-                                <action selector="filterAction:" destination="VCH-GK-jaH" id="m3s-pS-GdV"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" systemItem="compose" id="ovc-xl-vHA">
+                        <barButtonItem key="rightBarButtonItem" image="ei-pencil" id="ovc-xl-vHA">
                             <connections>
                                 <segue destination="rr1-jx-MLx" kind="push" id="vj1-M0-h6U"/>
                             </connections>
@@ -106,7 +105,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="skE-j1-NV7" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1074.4000000000001" y="-169.56521739130437"/>
+            <point key="canvasLocation" x="-135.19999999999999" y="-169.56521739130437"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="fTm-5S-xsb">
@@ -123,7 +122,7 @@
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="bm6-Os-xkH" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2688" y="596.40179910044981"/>
+            <point key="canvasLocation" x="-3001" y="596"/>
         </scene>
         <!--Login View Controller-->
         <scene sceneID="hlR-4j-yzx">
@@ -203,10 +202,10 @@
             </objects>
             <point key="canvasLocation" x="-1855.2" y="595.95202398800609"/>
         </scene>
-        <!--Profile-->
+        <!--Blog-->
         <scene sceneID="pZT-hd-B6F">
             <objects>
-                <tableViewController title="Profile" id="NJR-jw-Kd1" customClass="BlogViewController" sceneMemberID="viewController">
+                <tableViewController title="Blog" id="NJR-jw-Kd1" customClass="BlogViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="UQ6-nv-K3A">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -236,7 +235,9 @@
         <scene sceneID="slX-NB-ZJR">
             <objects>
                 <navigationController id="bqF-EV-jyA" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" id="uDU-Ru-VA7"/>
+                    <tabBarItem key="tabBarItem" title="" image="ei-envelope" id="uDU-Ru-VA7">
+                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                    </tabBarItem>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="MLM-G7-sIv">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -275,7 +276,10 @@
                             <outlet property="delegate" destination="vqF-gx-pZG" id="xKF-Xt-zWe"/>
                         </connections>
                     </tableView>
-                    <tabBarItem key="tabBarItem" title="Chats" image="chats_icon" id="vxB-Z9-1il"/>
+                    <tabBarItem key="tabBarItem" title="" image="ei-envelope" id="vxB-Z9-1il">
+                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                        <offsetWrapper key="titlePositionAdjustment" horizontal="0.0" vertical="0.0"/>
+                    </tabBarItem>
                     <navigationItem key="navigationItem" title="Chats" id="hVh-CA-hQo"/>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8ge-Xf-wBN" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -330,7 +334,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Pm0-3R-NV9" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-356" y="-169"/>
+            <point key="canvasLocation" x="583.20000000000005" y="-169.56521739130437"/>
         </scene>
         <!--Chat View Controller-->
         <scene sceneID="pvH-EU-EhQ">
@@ -359,7 +363,65 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="a3c-tt-waA" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="470.39999999999998" y="-161.91904047976013"/>
+            <point key="canvasLocation" x="1408.8" y="-162.3688155922039"/>
+        </scene>
+        <!--Table View Controller-->
+        <scene sceneID="g01-td-y6A">
+            <objects>
+                <tableViewController id="q23-tm-nTI" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="kjj-SM-22v">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="Nlo-27-7g6">
+                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Nlo-27-7g6" id="1Ma-Fq-9gP">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="q23-tm-nTI" id="Wdn-FV-nxh"/>
+                            <outlet property="delegate" destination="q23-tm-nTI" id="5xz-ha-vpb"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="YuL-El-wFH"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Avi-e4-7zU" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-808.79999999999995" y="-856.82158920539734"/>
+        </scene>
+        <!--Profile-->
+        <scene sceneID="Zyp-VR-hlj">
+            <objects>
+                <tableViewController title="Profile" id="7Y0-3h-zWt" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="nT3-ZI-i7w">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="tSi-Pj-acC">
+                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tSi-Pj-acC" id="wk3-ZO-iIr">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="7Y0-3h-zWt" id="1Bz-sa-FSr"/>
+                            <outlet property="delegate" destination="7Y0-3h-zWt" id="fqT-hp-VZl"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="vgf-KH-dbr"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="vQg-XX-fxE" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-3092" y="-162"/>
         </scene>
         <!--Tab Bar Controller-->
         <scene sceneID="R7v-av-S80">
@@ -373,18 +435,117 @@
                     </tabBar>
                     <connections>
                         <segue destination="k3X-uv-0IF" kind="relationship" relationship="viewControllers" id="5rb-rf-WgC"/>
+                        <segue destination="YkB-dq-pv4" kind="relationship" relationship="viewControllers" id="uQw-Xa-hwe"/>
+                        <segue destination="wJv-nS-OaN" kind="relationship" relationship="viewControllers" id="5Pl-1T-DRQ"/>
                         <segue destination="bqF-EV-jyA" kind="relationship" relationship="viewControllers" id="L49-RF-BJa"/>
+                        <segue destination="c61-bC-EVf" kind="relationship" relationship="viewControllers" id="aPU-HP-Ctr"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="AnM-ht-zf8" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2686.4000000000001" y="-170.01499250374815"/>
+            <point key="canvasLocation" x="-1886" y="-170"/>
+        </scene>
+        <!--Table View Controller-->
+        <scene sceneID="m4V-XQ-WRo">
+            <objects>
+                <tableViewController id="irg-YA-Ovi" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="txa-ky-5bK">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="DWy-O3-T1C">
+                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="DWy-O3-T1C" id="bMl-aO-eZb">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="irg-YA-Ovi" id="yCr-Bf-e8U"/>
+                            <outlet property="delegate" destination="irg-YA-Ovi" id="5yB-2P-9U5"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="IAo-7r-IvK"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="f9t-89-mMI" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-2610.4000000000001" y="-856.82158920539734"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="rTx-Xr-jP4">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="wJv-nS-OaN" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="" image="ei-search" id="Hf1-fH-Ne9">
+                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                    </tabBarItem>
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="HfH-EY-4C6">
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="q23-tm-nTI" kind="relationship" relationship="rootViewController" id="iLJ-IP-aY8"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iDs-Ig-15k" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1748" y="-856.82158920539734"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="PRP-vE-Jhi">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="YkB-dq-pv4" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="" image="ei-bell" id="r5a-uD-dsg">
+                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                    </tabBarItem>
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="1ry-Mk-20P">
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="irg-YA-Ovi" kind="relationship" relationship="rootViewController" id="pci-IM-sHP"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Eb9-pv-yRC" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-3551.1999999999998" y="-857.72113943028489"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="y8S-HS-lIv">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="c61-bC-EVf" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="" image="ei-gear" id="529-8F-A6e">
+                        <inset key="imageInsets" minX="0.0" minY="6" maxX="0.0" maxY="-6"/>
+                    </tabBarItem>
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Mr4-B4-jXb">
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="7Y0-3h-zWt" kind="relationship" relationship="rootViewController" id="iJd-OZ-Z0w"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="KlJ-5c-fac" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-3839" y="-162"/>
         </scene>
     </scenes>
     <resources>
         <image name="Splash.png" width="96" height="96"/>
-        <image name="chats_icon" width="20" height="22"/>
-        <image name="nearby_icon" width="20" height="20"/>
+        <image name="ei-bell" width="34" height="32"/>
+        <image name="ei-clock" width="34" height="34"/>
+        <image name="ei-envelope" width="34" height="26"/>
+        <image name="ei-gear" width="32" height="32"/>
+        <image name="ei-pencil" width="30" height="29"/>
+        <image name="ei-search" width="32" height="32"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="vj1-M0-h6U"/>
diff --git a/Juick/ViewControllers/DialogsViewController.m b/Juick/ViewControllers/DialogsViewController.m
index c4ace7f..1f9f8e0 100644
--- a/Juick/ViewControllers/DialogsViewController.m
+++ b/Juick/ViewControllers/DialogsViewController.m
@@ -16,7 +16,6 @@
 @implementation DialogsViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self.tabBarItem setTitle:@"Chats"];
     self.navigationController.visibleViewController.navigationItem.title = @"Chats";
     [self.view setBackgroundColor:[ColorScheme mainBackground]];
     [self.tableView registerNib:[UINib nibWithNibName:@"ConversationCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"notificationCell"];
diff --git a/Juick/ViewControllers/DiscoverViewController.h b/Juick/ViewControllers/FeedViewController.h
index bb34d5e..76388aa 100644
--- a/Juick/ViewControllers/DiscoverViewController.h
+++ b/Juick/ViewControllers/FeedViewController.h
@@ -9,6 +9,6 @@
 #import <UIKit/UIKit.h>
 #import "MessagesViewController.h"
 
-@interface DiscoverViewController : MessagesViewController<MessagesDelegate, MessageCellDelegate>
+@interface FeedViewController : MessagesViewController<MessagesDelegate, MessageCellDelegate>
 
 @end
diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/FeedViewController.m
index 94e1d16..67d80e1 100644
--- a/Juick/ViewControllers/DiscoverViewController.m
+++ b/Juick/ViewControllers/FeedViewController.m
@@ -6,7 +6,7 @@
 //  Copyright © 2017 com.juick. All rights reserved.
 //
 
-#import "DiscoverViewController.h"
+#import "FeedViewController.h"
 #import "ThreadViewController.h"
 #import "BlogViewController.h"
 #import "MessageCell.h"
@@ -14,12 +14,12 @@
 #import "AppDelegate.h"
 #import "ColorScheme.h"
 
-@interface DiscoverViewController ()
+@interface FeedViewController ()
 
 @property NSString *selectedUser;
 @end
 
-@implementation DiscoverViewController
+@implementation FeedViewController
 
 -(void) viewDidLoad {
     self.messagesDelegate = self;
@@ -28,7 +28,6 @@
             if (user) {
                 if ([self.path length] == 0) {
                     self.path = [APIClient feedUrl];
-                    [self.tabBarItem setTitle:@"My feed"];
                     self.navigationController.visibleViewController.navigationItem.title = @"My feed";
                 }
                 [self setShouldScrollToBottomOnRefresh:NO];
@@ -41,7 +40,6 @@
     } else {
         if ([self.path length] == 0) {
             self.path = [APIClient messagesUrl];
-            [self.tabBarItem setTitle:@"Discover"];
             self.navigationController.visibleViewController.navigationItem.title = @"Discover";
         }
         [self setShouldScrollToBottomOnRefresh:NO];
@@ -107,7 +105,6 @@
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"My feed" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         self.path = [APIClient feedUrl];
-        [self.tabBarItem setTitle:@"My feed"];
         self.navigationController.visibleViewController.navigationItem.title = @"My feed";
         self.params = nil;
         [self.messages removeAllObjects];
@@ -116,7 +113,6 @@
     }]];
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"Discover" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         self.path = [APIClient messagesUrl];
-        [self.tabBarItem setTitle:@"Discover"];
         self.navigationController.visibleViewController.navigationItem.title = @"Discover";
         self.params = nil;
         [self.messages removeAllObjects];
@@ -125,7 +121,6 @@
     }]];
     [filterAlert addAction:[UIAlertAction actionWithTitle:@"Discussions" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         self.path = [APIClient discussionsUrl];
-        [self.tabBarItem setTitle:@"Discussions"];
         self.navigationController.visibleViewController.navigationItem.title = @"Discussions";
         self.params = nil;
         [self.messages removeAllObjects];