Heads Up [1/2]

Add icons and some cleanup