Optimized images

Change-Id: Ic34a045ed57987084dc01d7e32e9f55739035979