Fix default icon retrieval.

And replace continue; with if() statements (supposably more compile
friendly)