new images
merge icon into header image and simplify template