Optimized images

Change-Id: Ifb3072c48530b9249a4bea1ae43b7989d29731d4