Shrink store icons, clean up code