diff --git a/Sources/Extensions/UIView+Extensions.swift b/Sources/Extensions/UIView+Extensions.swift
index 7a83707f..21d4c66d 100644
--- a/Sources/Extensions/UIView+Extensions.swift
+++ b/Sources/Extensions/UIView+Extensions.swift
@@ -52,6 +52,17 @@ extension UIView {
         ]
         NSLayoutConstraint.activate(constraints)
     }
+    
+    func constraint(equalTo size: CGSize) {
+        guard superview != nil else { return }
+        translatesAutoresizingMaskIntoConstraints = false
+        let constraints: [NSLayoutConstraint] = [
+            widthAnchor.constraint(equalToConstant: size.width),
+            heightAnchor.constraint(equalToConstant: size.height)
+        ]
+        NSLayoutConstraint.activate(constraints)
+        
+    }
 
     @discardableResult
     func addConstraints(_ top: NSLayoutYAxisAnchor? = nil, left: NSLayoutXAxisAnchor? = nil, bottom: NSLayoutYAxisAnchor? = nil, right: NSLayoutXAxisAnchor? = nil, topConstant: CGFloat = 0, leftConstant: CGFloat = 0, bottomConstant: CGFloat = 0, rightConstant: CGFloat = 0, widthConstant: CGFloat = 0, heightConstant: CGFloat = 0) -> [NSLayoutConstraint] {
diff --git a/Sources/Views/Cells/MediaMessageCell.swift b/Sources/Views/Cells/MediaMessageCell.swift
index d84761ba..85df89d0 100644
--- a/Sources/Views/Cells/MediaMessageCell.swift
+++ b/Sources/Views/Cells/MediaMessageCell.swift
@@ -32,7 +32,6 @@ open class MediaMessageCell: MessageCollectionViewCell {
 
     open lazy var playButtonView: PlayButtonView = {
         let playButtonView = PlayButtonView()
-        playButtonView.frame.size = CGSize(width: 35, height: 35)
         return playButtonView
     }()
 
@@ -43,6 +42,7 @@ open class MediaMessageCell: MessageCollectionViewCell {
     open func setupConstraints() {
         imageView.fillSuperview()
         playButtonView.centerInSuperview()
+        playButtonView.constraint(equalTo: CGSize(width: 35, height: 35))
     }
 
     open override func setupSubviews() {
diff --git a/Sources/Views/Cells/TextMessageCell.swift b/Sources/Views/Cells/TextMessageCell.swift
index df312216..a1a24b15 100644
--- a/Sources/Views/Cells/TextMessageCell.swift
+++ b/Sources/Views/Cells/TextMessageCell.swift
@@ -44,7 +44,6 @@ open class TextMessageCell: MessageCollectionViewCell {
         super.apply(layoutAttributes)
         if let attributes = layoutAttributes as? MessagesCollectionViewLayoutAttributes {
             messageLabel.configure {
-                messageLabel.frame = attributes.messageContainerFrame
                 messageLabel.textInsets = attributes.messageLabelInsets
                 messageLabel.font = attributes.messageLabelFont
             }
@@ -62,7 +61,7 @@ open class TextMessageCell: MessageCollectionViewCell {
         messageContainerView.addSubview(messageLabel)
         setupConstraints()
     }
-
+    
     open func setupConstraints() {
         messageLabel.fillSuperview()
     }
diff --git a/Sources/Views/PlayButtonView.swift b/Sources/Views/PlayButtonView.swift
index 1296c83c..ec650b9b 100644
--- a/Sources/Views/PlayButtonView.swift
+++ b/Sources/Views/PlayButtonView.swift
@@ -30,29 +30,8 @@ open class PlayButtonView: UIView {
 
     open let triangleView = UIView()
 
-    private var triangleHeightConstraint: NSLayoutConstraint?
-    private var triangleWidthConstraint: NSLayoutConstraint?
     private var triangleCenterXConstraint: NSLayoutConstraint?
-
-    private var triangleViewSize: CGSize {
-        return CGSize(width: frame.width/2, height: frame.height/2)
-    }
-
-    open override var frame: CGRect {
-        didSet {
-            updateTriangleConstraints()
-            applyCornerRadius()
-            applyTriangleMask()
-        }
-    }
-
-    open override var bounds: CGRect {
-        didSet {
-            updateTriangleConstraints()
-            applyCornerRadius()
-            applyTriangleMask()
-        }
-    }
+    private var cacheFrame: CGRect = .zero
 
     // MARK: - Initializers
 
@@ -61,8 +40,6 @@ open class PlayButtonView: UIView {
 
         setupSubviews()
         setupConstraints()
-        applyCornerRadius()
-        applyTriangleMask()
 
         triangleView.clipsToBounds = true
         triangleView.backgroundColor = .black
@@ -74,6 +51,17 @@ open class PlayButtonView: UIView {
     }
 
     // MARK: - Methods
+    
+    open override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        guard !cacheFrame.equalTo(frame) else { return }
+        cacheFrame = frame
+        
+        updateTriangleConstraints()
+        applyCornerRadius()
+        applyTriangleMask()
+    }
 
     private func setupSubviews() {
         addSubview(triangleView)
@@ -82,13 +70,11 @@ open class PlayButtonView: UIView {
     private func setupConstraints() {
         triangleView.translatesAutoresizingMaskIntoConstraints = false
 
-        let centerX = triangleView.centerXAnchor.constraint(equalTo: centerXAnchor, constant: triangleViewSize.width/8)
+        let centerX = triangleView.centerXAnchor.constraint(equalTo: centerXAnchor)
         let centerY = triangleView.centerYAnchor.constraint(equalTo: centerYAnchor)
-        let width = triangleView.widthAnchor.constraint(equalToConstant: triangleViewSize.width)
-        let height = triangleView.heightAnchor.constraint(equalToConstant: triangleViewSize.height)
+        let width = triangleView.widthAnchor.constraint(equalTo: widthAnchor, multiplier: 0.5)
+        let height = triangleView.heightAnchor.constraint(equalTo: heightAnchor, multiplier: 0.5)
 
-        triangleWidthConstraint = width
-        triangleHeightConstraint = height
         triangleCenterXConstraint = centerX
 
         NSLayoutConstraint.activate([centerX, centerY, width, height])
@@ -113,13 +99,11 @@ open class PlayButtonView: UIView {
     }
 
     private func updateTriangleConstraints() {
-        triangleWidthConstraint?.constant = triangleViewSize.width
-        triangleHeightConstraint?.constant = triangleViewSize.height
-        triangleCenterXConstraint?.constant = triangleViewSize.width/8
+        triangleCenterXConstraint?.constant = frame.width/8
     }
 
     private func applyTriangleMask() {
-        let rect = CGRect(origin: .zero, size: triangleViewSize)
+        let rect = CGRect(origin: .zero, size: triangleView.bounds.size)
         triangleView.layer.mask = triangleMask(for: rect)
     }