Adds icons, fixed design.
WIP