CMS-1388 Image Picker - Adjustments to design