Cleanup and fix errors with R16 compiler
Fix make dependencies and rules for icons