changed integration mode back for working on my computer
Merge branch 'develop'
Icon is now working on Mac Platform
updated main controller manually after git is playing stupid all the time...