Optimize images

Change-Id: I2af16030ba57aaa2f09e60ce7b75a004562e5867