         }
 
         faviconBG.snp.makeConstraints { make in
-            make.top.left.right.equalTo(self)
-            make.bottom.equalTo(self).inset(TopSiteCellUX.TitleHeight)
+            make.top.left.right.equalTo(contentView)
+            make.bottom.equalTo(contentView).inset(TopSiteCellUX.TitleHeight)
         }
     }
 
     override func layoutSubviews() {
         super.layoutSubviews()
         titleBorder.frame = CGRect(x: 0, y: frame.height - TopSiteCellUX.TitleHeight -  TopSiteCellUX.BorderWidth, width: frame.width, height: TopSiteCellUX.BorderWidth)
-
-        imageView.snp.remakeConstraints { make in
-            make.size.equalTo(floor(self.frame.width * TopSiteCellUX.IconSizePercent))
-            make.centerX.equalTo(self)
-            make.centerY.equalTo(self).inset(-TopSiteCellUX.TitleHeight/2)
-        }
     }
 
     required init?(coder aDecoder: NSCoder) {

                make.centerY.equalTo(self.titleLabel.snp.centerY)
            }
            titleLabel.snp.updateConstraints { make in
                make.left.equalTo(self).offset(TopSiteCellUX.PinIconSize)
            }
        }


        pinImageView.removeFromSuperview()
        imageView.sd_cancelCurrentImageLoad()
        titleLabel.text = ""
    }

    func configureWithTopSiteItem(_ site: Site) {
