Better icon handeling.

If icon not found even though expected, returns null instead of
crashing.