Optimized images

Change-Id: Ic4766618d4b5dd24b20e8761a1f9c56440844e15