Fix icons and links to look right