I Spy...for a living

Fixes #715, Fixes #714, Fixes #705, Fixes #699, Fixes #636, Fixes #465, Fixes #327, Fixes #339, Fixes #340, Fixes #341 and Fixes #689. I made a mistake with removing an icon so I'm just going to go back and fix that.