diff --git a/Tusker/Views/Attachments/AttachmentsContainerView.swift b/Tusker/Views/Attachments/AttachmentsContainerView.swift
index ee0801d0..da54fd96 100644
--- a/Tusker/Views/Attachments/AttachmentsContainerView.swift
+++ b/Tusker/Views/Attachments/AttachmentsContainerView.swift
@@ -64,12 +64,20 @@ class AttachmentsContainerView: UIView {
             switch attachments.count {
             case 1:
                 let attachmentView = createAttachmentView(index: 0)
+                attachmentView.layer.cornerRadius = 5
+                attachmentView.layer.masksToBounds = true
                 fillView(attachmentView)
                 sendSubviewToBack(attachmentView)
                 accessibilityElements.append(attachmentView)
             case 2:
                 let left = createAttachmentView(index: 0)
+                left.layer.cornerRadius = 5
+                left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
+                left.layer.masksToBounds = true
                 let right = createAttachmentView(index: 1)
+                right.layer.cornerRadius = 5
+                right.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
+                right.layer.masksToBounds = true
                 let stack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     right
@@ -83,8 +91,17 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(right)
             case 3:
                 let left = createAttachmentView(index: 0)
+                left.layer.cornerRadius = 5
+                left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
+                left.layer.masksToBounds = true
                 let topRight = createAttachmentView(index: 1)
+                topRight.layer.cornerRadius = 5
+                topRight.layer.maskedCorners = .layerMaxXMinYCorner
+                topRight.layer.masksToBounds = true
                 let bottomRight = createAttachmentView(index: 2)
+                bottomRight.layer.cornerRadius = 5
+                bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
+                bottomRight.layer.masksToBounds = true
                 let outerStack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -103,13 +120,25 @@ class AttachmentsContainerView: UIView {
                 accessibilityElements.append(bottomRight)
             case 4:
                 let topLeft = createAttachmentView(index: 0)
+                topLeft.layer.cornerRadius = 5
+                topLeft.layer.maskedCorners = .layerMinXMinYCorner
+                topLeft.layer.masksToBounds = true
                 let bottomLeft = createAttachmentView(index: 2)
+                bottomLeft.layer.cornerRadius = 5
+                bottomLeft.layer.maskedCorners = .layerMinXMaxYCorner
+                bottomLeft.layer.masksToBounds = true
                 let left = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
                     topLeft,
                     bottomLeft
                 ])
                 let topRight = createAttachmentView(index: 1)
+                topRight.layer.cornerRadius = 5
+                topRight.layer.maskedCorners = .layerMaxXMinYCorner
+                topRight.layer.masksToBounds = true
                 let bottomRight = createAttachmentView(index: 3)
+                bottomRight.layer.cornerRadius = 5
+                bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
+                bottomRight.layer.masksToBounds = true
                 let outerStack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@@ -135,6 +164,9 @@ class AttachmentsContainerView: UIView {
                 moreView.translatesAutoresizingMaskIntoConstraints = false
                 moreView.isUserInteractionEnabled = true
                 moreView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(moreViewTapped)))
+                moreView.layer.cornerRadius = 5
+                moreView.layer.maskedCorners = .layerMaxXMaxYCorner
+                moreView.layer.masksToBounds = true
                 let moreLabel = UILabel()
                 moreLabel.text = "\(attachments.count - 3) more..."
                 moreLabel.textColor = .secondaryLabel
@@ -144,12 +176,21 @@ class AttachmentsContainerView: UIView {
                 moreView.accessibilityLabel = moreLabel.text
 
                 let topLeft = createAttachmentView(index: 0)
+                topLeft.layer.cornerRadius = 5
+                topLeft.layer.maskedCorners = .layerMinXMinYCorner
+                topLeft.layer.masksToBounds = true
                 let bottomLeft = createAttachmentView(index: 2)
+                bottomLeft.layer.cornerRadius = 5
+                bottomLeft.layer.maskedCorners = .layerMinXMaxYCorner
+                bottomLeft.layer.masksToBounds = true
                 let left = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
                     topLeft,
                     bottomLeft
                 ])
                 let topRight = createAttachmentView(index: 1)
+                topRight.layer.cornerRadius = 5
+                topRight.layer.maskedCorners = .layerMaxXMinYCorner
+                topRight.layer.masksToBounds = true
                 let outerStack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
                     left,
                     createAttachmentsStack(axis: .vertical, arrangedSubviews: [
diff --git a/Tusker/Views/Status/BaseStatusTableViewCell.swift b/Tusker/Views/Status/BaseStatusTableViewCell.swift
index 3cb0d7fd..267ad904 100644
--- a/Tusker/Views/Status/BaseStatusTableViewCell.swift
+++ b/Tusker/Views/Status/BaseStatusTableViewCell.swift
@@ -84,8 +84,6 @@ class BaseStatusTableViewCell: UITableViewCell {
         avatarImageView.layer.masksToBounds = true
     
         attachmentsView.delegate = self
-        attachmentsView.layer.cornerRadius = 5
-        attachmentsView.layer.masksToBounds = true
         
         collapseButton.layer.masksToBounds = true
         collapseButton.layer.cornerRadius = 5