diff --git a/Yep/Configs/YepConfig.swift b/Yep/Configs/YepConfig.swift
index 87ef69c4..2db5c34d 100644
--- a/Yep/Configs/YepConfig.swift
+++ b/Yep/Configs/YepConfig.swift
@@ -119,6 +119,8 @@ class YepConfig {
 
         static let mediaMinWidth: CGFloat = 60
         static let mediaMinHeight: CGFloat = 30
+
+        static let centerXOffset: CGFloat = 4
     }
 
     struct MetaData {
diff --git a/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.swift b/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.swift
index a5113fce..89dfe381 100644
--- a/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.swift
+++ b/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.swift
@@ -17,6 +17,7 @@ class ChatLeftImageCell: UICollectionViewCell {
     @IBOutlet weak var messageImageViewWidthConstrint: NSLayoutConstraint!
     
     @IBOutlet weak var loadingProgressView: MessageLoadingProgressView!
+    @IBOutlet weak var loadingProgressViewCenterXConstraint: NSLayoutConstraint!
 
     typealias MediaTapAction = () -> Void
     var mediaTapAction: MediaTapAction?
@@ -25,6 +26,7 @@ class ChatLeftImageCell: UICollectionViewCell {
         super.awakeFromNib()
 
         avatarImageViewWidthConstraint.constant = YepConfig.chatCellAvatarSize()
+        loadingProgressViewCenterXConstraint.constant = YepConfig.ChatCell.centerXOffset
 
         messageImageView.tintColor = UIColor.leftBubbleTintColor()
 
diff --git a/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib b/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib
index 3a60ca8e..03040bc5 100644
--- a/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib
+++ b/Yep/Views/Cells/ChatLeftImage/ChatLeftImageCell.xib
@@ -56,6 +56,7 @@
                 <outlet property="avatarImageView" destination="m2x-3M-xx2" id="YKv-gh-cr8"/>
                 <outlet property="avatarImageViewWidthConstraint" destination="JD9-KR-rN4" id="NiB-3l-0jJ"/>
                 <outlet property="loadingProgressView" destination="sFT-ZV-Yxs" id="DEM-ij-EQj"/>
+                <outlet property="loadingProgressViewCenterXConstraint" destination="R59-th-hn1" id="SQb-S1-yUi"/>
                 <outlet property="messageImageView" destination="2Dg-WB-LbN" id="JaH-m0-woi"/>
                 <outlet property="messageImageViewWidthConstrint" destination="ywK-Cr-C5H" id="WVJ-Ub-r8n"/>
             </connections>
diff --git a/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.swift b/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.swift
index 860e09d8..f2ee5abe 100644
--- a/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.swift
+++ b/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.swift
@@ -17,6 +17,7 @@ class ChatLeftVideoCell: UICollectionViewCell {
     @IBOutlet weak var thumbnailImageViewWidthConstraint: NSLayoutConstraint!
 
     @IBOutlet weak var playImageView: UIImageView!
+    @IBOutlet weak var playImageViewCenterXConstraint: NSLayoutConstraint!
     
     @IBOutlet weak var loadingProgressView: MessageLoadingProgressView!
     
@@ -27,6 +28,7 @@ class ChatLeftVideoCell: UICollectionViewCell {
         super.awakeFromNib()
 
         avatarImageViewWidthConstraint.constant = YepConfig.chatCellAvatarSize()
+        playImageViewCenterXConstraint.constant = YepConfig.ChatCell.centerXOffset
         
         thumbnailImageView.tintColor = UIColor.leftBubbleTintColor()
 
diff --git a/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib b/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib
index f86754a1..82746a62 100644
--- a/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib
+++ b/Yep/Views/Cells/ChatLeftVideo/ChatLeftVideoCell.xib
@@ -28,7 +28,7 @@
                             <constraint firstAttribute="width" constant="126" id="g02-F3-bJ5"/>
                         </constraints>
                     </imageView>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_playvideo" translatesAutoresizingMaskIntoConstraints="NO" id="kj2-PU-9Ld" userLabel="Play Image View">
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="icon_playvideo" translatesAutoresizingMaskIntoConstraints="NO" id="kj2-PU-9Ld" userLabel="Play Image View">
                         <rect key="frame" x="113" y="46" width="30" height="30"/>
                         <animations/>
                     </imageView>
@@ -63,6 +63,7 @@
                 <outlet property="avatarImageViewWidthConstraint" destination="Hgr-UG-6Vl" id="06G-Cs-NA2"/>
                 <outlet property="loadingProgressView" destination="S4T-37-s77" id="Mp9-dx-PM7"/>
                 <outlet property="playImageView" destination="kj2-PU-9Ld" id="h0Y-vn-EUp"/>
+                <outlet property="playImageViewCenterXConstraint" destination="Kim-ke-x6p" id="Ebr-9K-4TC"/>
                 <outlet property="thumbnailImageView" destination="dJV-3p-NM6" id="47m-Jp-5x1"/>
                 <outlet property="thumbnailImageViewWidthConstraint" destination="g02-F3-bJ5" id="K7o-Oc-80Z"/>
             </connections>
diff --git a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.swift b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.swift
index e46215e1..28b308d3 100644
--- a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.swift
+++ b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.swift
@@ -17,6 +17,7 @@ class ChatRightVideoCell: ChatRightBaseCell {
     @IBOutlet weak var thumbnailImageViewWidthConstraint: NSLayoutConstraint!
 
     @IBOutlet weak var playImageView: UIImageView!
+    @IBOutlet weak var playImageViewCenterXConstraint: NSLayoutConstraint!
 
     typealias MediaTapAction = () -> Void
     var mediaTapAction: MediaTapAction?
@@ -25,6 +26,7 @@ class ChatRightVideoCell: ChatRightBaseCell {
         super.awakeFromNib()
 
         avatarImageViewWidthConstraint.constant = YepConfig.chatCellAvatarSize()
+        playImageViewCenterXConstraint.constant = YepConfig.ChatCell.centerXOffset
 
         thumbnailImageView.tintColor = UIColor.rightBubbleTintColor()
 
diff --git a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
index ba27e5b6..3e9ba0fa 100644
--- a/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
+++ b/Yep/Views/Cells/ChatRightVideo/ChatRightVideoCell.xib
@@ -51,7 +51,7 @@
                 <constraint firstItem="Usu-mV-m39" firstAttribute="centerY" secondItem="t6J-8M-Prm" secondAttribute="centerY" id="Ubw-MU-fwT"/>
                 <constraint firstAttribute="bottom" secondItem="Usu-mV-m39" secondAttribute="bottom" id="V8A-BH-zoE"/>
                 <constraint firstItem="cv4-jk-ysG" firstAttribute="top" secondItem="Usu-mV-m39" secondAttribute="top" id="Wni-Je-PVy"/>
-                <constraint firstItem="4Zc-y0-R7I" firstAttribute="centerX" secondItem="Usu-mV-m39" secondAttribute="centerX" constant="-5" id="YuD-W1-VF7"/>
+                <constraint firstItem="Usu-mV-m39" firstAttribute="centerX" secondItem="4Zc-y0-R7I" secondAttribute="centerX" constant="5" id="YuD-W1-VF7"/>
                 <constraint firstItem="cv4-jk-ysG" firstAttribute="leading" secondItem="Usu-mV-m39" secondAttribute="trailing" constant="5" id="kHP-gM-bdJ"/>
                 <constraint firstItem="4Zc-y0-R7I" firstAttribute="centerY" secondItem="Usu-mV-m39" secondAttribute="centerY" id="mR7-Ve-yWj"/>
                 <constraint firstItem="Usu-mV-m39" firstAttribute="leading" secondItem="t6J-8M-Prm" secondAttribute="trailing" constant="5" id="nec-Oc-Qwb"/>
@@ -63,6 +63,7 @@
                 <outlet property="dotImageView" destination="t6J-8M-Prm" id="gDj-YZ-VfS"/>
                 <outlet property="gapBetweenDotImageViewAndBubbleConstraint" destination="nec-Oc-Qwb" id="rP3-RC-rbh"/>
                 <outlet property="playImageView" destination="4Zc-y0-R7I" id="yph-te-Ga1"/>
+                <outlet property="playImageViewCenterXConstraint" destination="YuD-W1-VF7" id="0UY-Qf-oko"/>
                 <outlet property="thumbnailImageView" destination="Usu-mV-m39" id="Vsi-Q8-Ywh"/>
                 <outlet property="thumbnailImageViewWidthConstraint" destination="nix-mc-fis" id="rPY-SZ-rG5"/>
             </connections>