diff --git a/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf b/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf
index 9058d72e..996c1ef9 100644
Binary files a/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf and b/Yep/Images.xcassets/icon_dot_failed.imageset/icon_dot_failed.pdf differ
diff --git a/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf b/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf
index 3323c1b4..d83e3d92 100644
Binary files a/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf and b/Yep/Images.xcassets/icon_dot_sending.imageset/icon_dot_sending.pdf differ
diff --git a/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf b/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf
index 5982732e..a72b0483 100644
Binary files a/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf and b/Yep/Images.xcassets/icon_dot_unread.imageset/icon_dot_unread.pdf differ
diff --git a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
index 858290b1..7cdf7ee8 100644
--- a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
+++ b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.xib
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ChatRightAudioCell" id="gTV-IL-0wX" customClass="ChatRightAudioCell" customModule="Yep" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="3" width="316" height="105"/>
+            <rect key="frame" x="0.0" y="0.0" width="316" height="105"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                 <rect key="frame" x="0.0" y="0.0" width="316" height="105"/>
@@ -52,8 +53,8 @@
                         </subviews>
                         <animations/>
                     </view>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="dkr-y8-xRJ" userLabel="Dot Image View">
-                        <rect key="frame" x="95" y="50" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="dkr-y8-xRJ" userLabel="Dot Image View">
+                        <rect key="frame" x="95" y="50" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
@@ -76,13 +77,8 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
         <image name="icon_play" width="30" height="30"/>
         <image name="right_tail_bubble" width="48" height="40"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib b/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
index 28e6f781..5549996a 100644
--- a/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
+++ b/Yep/Views/Cells/ChatRightImage/ChatRightImageCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -20,8 +21,8 @@
                         <rect key="frame" x="50" y="0.0" width="151" height="121"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="C9m-E2-m8h" userLabel="Dot Image View">
-                        <rect key="frame" x="39" y="58" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="C9m-E2-m8h" userLabel="Dot Image View">
+                        <rect key="frame" x="39" y="58" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
                 </subviews>
@@ -37,11 +38,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib b/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
index 9794c5be..f35c3bdc 100644
--- a/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
+++ b/Yep/Views/Cells/ChatRightLocation/ChatRightLocationCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -20,15 +21,15 @@
                         <rect key="frame" x="57" y="0.0" width="192" height="108"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="eTJ-7c-9qB" userLabel="Dot Image View">
-                        <rect key="frame" x="46" y="56" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="eTJ-7c-9qB" userLabel="Dot Image View">
+                        <rect key="frame" x="46" y="56" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LcY-WJ-YG7" userLabel="Location Name Label">
                         <rect key="frame" x="77" y="88" width="152" height="20"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
@@ -45,11 +46,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib b/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib
index ce2c56bf..1b5fd1dc 100644
--- a/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib
+++ b/Yep/Views/Cells/ChatRightText/ChatRightTextCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -28,8 +29,8 @@
                         <animations/>
                         <color key="tintColor" red="0.80000001192092896" green="0.40000000596046448" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="tB7-GG-3Zd" userLabel="Dot Image View">
-                        <rect key="frame" x="310" y="62.5" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="tB7-GG-3Zd" userLabel="Dot Image View">
+                        <rect key="frame" x="310" y="62.5" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
@@ -69,11 +70,6 @@
     <resources>
         <image name="bubble_body" width="42" height="40"/>
         <image name="bubble_right_tail" width="13" height="14"/>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
index b29b8373..caf44d1e 100644
--- a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
+++ b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -27,8 +28,8 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="t6J-8M-Prm" userLabel="Dot Image View">
-                        <rect key="frame" x="52" y="55" width="6" height="6"/>
+                    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_dot_sending" id="t6J-8M-Prm" userLabel="Dot Image View">
+                        <rect key="frame" x="52" y="55" width="10" height="10"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <animations/>
                     </imageView>
@@ -48,12 +49,7 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="icon_dot_sending" width="8" height="8"/>
+        <image name="icon_dot_sending" width="10" height="10"/>
         <image name="icon_playvideo" width="30" height="30"/>
     </resources>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
 </document>