Rejigger options to make a little more sense
Add icon detection