made all icons sprites
merged conflicts when pushing image sprites