diff --git a/MVMCoreUI/Atoms/Views/ListItemWithImage.swift b/MVMCoreUI/Atoms/Views/ListItemWithImage.swift
index dc0fc68a..334020e4 100644
--- a/MVMCoreUI/Atoms/Views/ListItemWithImage.swift
+++ b/MVMCoreUI/Atoms/Views/ListItemWithImage.swift
@@ -17,15 +17,13 @@ import UIKit
     let title = Label.commonLabelH3(true)
     let message = Label.commonLabelB3(true)
     let button = PrimaryButton.primaryTinyButton(false)!
-    let imageLoader = MFLoadImageView()
+    let imageLoader = MFLoadImageView(pinnedEdges: .all)
     let leftContainer = ViewConstrainingView.empty()
     
     //------------------------------------------------------
     // MARK: - Constraints
     //------------------------------------------------------
     
-    var imageWidthConstraint: NSLayoutConstraint?
-    var imageHeightConstraint: NSLayoutConstraint?
     var imageLeadingConstraint: NSLayoutConstraint?
     var buttonTopConstraint: NSLayoutConstraint?
     var messageTopConstraint: NSLayoutConstraint?
@@ -58,6 +56,8 @@ import UIKit
     override open func setupView() {
         super.setupView()
         
+        imageLoader.addSizeConstraintsForAspectRatio = true
+        
         guard subviews.isEmpty else { return }
         
         button.setAsSecondaryCustom()
@@ -96,16 +96,10 @@ import UIKit
         
         imageLoader.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
         layoutMarginsGuide.trailingAnchor.constraint(equalTo: imageLoader.trailingAnchor).isActive = true
-        imageLeadingConstraint = imageLoader.leadingAnchor.constraint(greaterThanOrEqualTo: leftContainer.trailingAnchor, constant: 16)
+        imageLeadingConstraint = imageLoader.leadingAnchor.constraint(equalTo: leftContainer.trailingAnchor, constant: 16)
         imageLeadingConstraint?.isActive = true
         imageLoader.topAnchor.constraint(greaterThanOrEqualTo: topAnchor).isActive = true
         
-        imageHeightConstraint = imageLoader.heightAnchor.constraint(equalToConstant: 0)
-        imageHeightConstraint?.isActive = true
-
-        imageWidthConstraint = imageLoader.widthAnchor.constraint(equalToConstant: 0)
-        imageWidthConstraint?.isActive = true
-        
         bottomAnchor.constraint(greaterThanOrEqualTo: imageLoader.bottomAnchor).isActive = true
         let imageloaderBottom = imageLoader.bottomAnchor.constraint(equalTo: bottomAnchor)
         imageloaderBottom.priority = UILayoutPriority(249)
@@ -114,7 +108,7 @@ import UIKit
     
     override open func updateView(_ size: CGFloat) {
         super.updateView(size)
-        
+    
         title.updateView(size)
         message.updateView(size)
         button.updateView(size)
@@ -123,19 +117,18 @@ import UIKit
         
         messageTopConstraint?.constant = title.hasText ? PaddingOne : 0
         buttonTopConstraint?.constant = message.hasText ? PaddingTwo : (title.hasText ? PaddingOne : 0)
-        
-        if imageWidthConstraint?.constant == 0 {
-            imageLeadingConstraint?.constant = 0
-        }
     }
     
+    //------------------------------------------------------
+    // MARK: - Methods
+    //------------------------------------------------------
+    
     override open func reset() {
         super.reset()
         
         title.text = ""
         message.text = ""
         imageLoader.imageView.image = nil
-        imageWidthConstraint?.constant = 0
         imageLeadingConstraint?.constant = 16
         backgroundColor = nil
     }
@@ -144,15 +137,10 @@ import UIKit
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         
         guard let dictionary = json else { return }
-        
+
         title.setWithJSON(dictionary.optionalDictionaryForKey("title"), delegateObject: delegateObject, additionalData: additionalData)
         message.setWithJSON(dictionary.optionalDictionaryForKey("message"), delegateObject: delegateObject, additionalData: additionalData)
         button.setWithJSON(dictionary.optionalDictionaryForKey("button"), delegateObject: delegateObject, additionalData: additionalData)
         imageLoader.setWithJSON(dictionary.optionalDictionaryForKey("image"), delegateObject: delegateObject, additionalData: additionalData)
-        
-        if let imageJSON = dictionary.optionalDictionaryForKey("image") {
-            imageWidthConstraint?.constant = CGFloat(imageJSON.floatForKey("width"))
-            imageHeightConstraint?.constant = CGFloat(imageJSON.floatForKey("height"))
-        }
     }
 }