         imageView.snp_remakeConstraints(closure: { make in
             let imagePadding: CGFloat = (UIScreen.mainScreen().traitCollection.horizontalSizeClass == .Compact) ? ThumbnailCellUX.ImagePaddingCompact : ThumbnailCellUX.ImagePadding
             let insets = UIEdgeInsetsMake(imagePadding, imagePadding, imagePadding, imagePadding)
-            make.top.left.right.equalTo(self.imageWrapper).insets(insets)
+            make.top.equalTo(self.imageWrapper).inset(insets.top)
+            make.left.right.equalTo(self.imageWrapper).inset(insets.left)
+            make.right.equalTo(self.imageWrapper).inset(insets.right)
             make.bottom.equalTo(textWrapper.snp_top).offset(-imagePadding) // .insets(insets)
         })
 

    var imagePadding: CGFloat = 0 {
        didSet {
            imageView.snp_remakeConstraints(closure: { make in
                let insets = UIEdgeInsetsMake(imagePadding, imagePadding, imagePadding, imagePadding)
                make.top.left.right.equalTo(self.imageWrapper).insets(insets)
                make.bottom.equalTo(textWrapper.snp_top).offset(-imagePadding)
            })

        contentView.addSubview(removeButton)

        imageWrapper.snp_remakeConstraints(closure: { make in
            make.top.equalTo(self.contentView).inset(ThumbnailCellUX.Insets.top)
            make.left.equalTo(self.contentView).inset(ThumbnailCellUX.Insets.left)
            make.bottom.equalTo(self.contentView).inset(ThumbnailCellUX.Insets.bottom)
            make.right.equalTo(self.contentView).inset(ThumbnailCellUX.Insets.right)
        })

        backgroundEffect?.snp_remakeConstraints(closure: { make in
