Add icons and refactor header