More code cleaning; update icons, fixed version number extraction