Fix for image sizing issues

Change-Id: Ibcf450fa92c66b7e448101a33c653a8f24051937