Optimized images

Change-Id: Id873d7794a08cf8ee773d31c1db797772451757e