Additional icons

Believe I've finally resolved all of the conflicts.