Merge pull request #214 from poupotte/master

Change icon path
improve controller error management