Re added icon support :)