Fix default icon retrieval.

And replace continue; with if() statements (supposably more compile
friendly)
Merge pull request #131 from CoenraadS/master

Fix default icon retrieval.