     }
     
     fileprivate func addScreenshotPreviewImageView() {
-        guard screenshotImageView == nil else { return }
-        
-        screenshotImageView = UIImageView()
-        screenshotImageView.translatesAutoresizingMaskIntoConstraints = false
-        screenshotImageView.image = screenshot
-        screenshotImageView.layer.borderWidth = 1
-        screenshotImageView.layer.borderColor = UIColor.lightGray.cgColor
-        view.addSubview(screenshotImageView)
-        
-        let metrics = ["sideSpacing": 8, "topSpacing": 8, "width": 125, "height": 221]
-        let views: [String: AnyObject] = ["topGuide": topLayoutGuide, "screenshotImageView": screenshotImageView]
-        
-        let horizontalConstraints = NSLayoutConstraint.constraints(withVisualFormat: "[screenshotImageView(width)]-sideSpacing-|", options: [], metrics: metrics, views: views)
-        let verticalConstraints = NSLayoutConstraint.constraints(withVisualFormat: "V:[topGuide]-topSpacing-[screenshotImageView(height)]", options: [], metrics: metrics, views: views)
+        guard screenshotButton == nil else { return }
+        
+        screenshotButton = UIButton(type: .custom)
+        screenshotButton.translatesAutoresizingMaskIntoConstraints = false
+        screenshotButton.setImage(screenshot, for: .normal)
+        screenshotButton.layer.borderWidth = 1
+        screenshotButton.layer.borderColor = UIColor(white: 0, alpha: 0.2).cgColor
+        screenshotButton.addTarget(self, action: #selector(imageButtonPressed(_:)), for: .touchUpInside)
+        view.addSubview(screenshotButton)
+        
+        let metrics = ["sideSpacing": 10, "topSpacing": 10, "width": 125, "height": 221]
+        let views: [String: AnyObject] = ["topGuide": topLayoutGuide, "screenshotButton": screenshotButton]
+        
+        let horizontalConstraints = NSLayoutConstraint.constraints(withVisualFormat: "[screenshotButton(width)]-sideSpacing-|", options: [], metrics: metrics, views: views)
+        let verticalConstraints = NSLayoutConstraint.constraints(withVisualFormat: "V:[topGuide]-topSpacing-[screenshotButton(height)]", options: [], metrics: metrics, views: views)
         
         view.addConstraints(horizontalConstraints)
         view.addConstraints(verticalConstraints)

        
        self.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.cancel, target: self, action: #selector(FeedbackViewController.cancelButtonPressed(_:)))
        
        let sendButton = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.compose, target: self, action: #selector(FeedbackViewController.sendButtonPressed(_:)))
        let imageButton = UIBarButtonItem(barButtonSystemItem: .camera, target: self, action: #selector(FeedbackViewController.imageButtonPressed(_:)))
        
        self.navigationItem.rightBarButtonItems = [sendButton, imageButton]
        
        registerNotifcationObserver()
        addActivityIndicator()

extension FeedbackViewController: ImageAnnotationViewControllerDelegate {
    func imageAnnotated(_ image: UIImage) {
        self.screenshot = image
        screenshotButton.setImage(image, for: .normal)
    }
}

