Modified iconhandler to work when no handler was mapped (a.k.a. my machine
Merge branch 'master' into redesign