Optimized images

Change-Id: If81835fa74016a30e3e41f8728757eda97182530