Swap images for font icons, fix header