aapis Merge pull request #136 from jgirardet/icon