Windows icon fix + related code cleanup

also updated codeblocks project