Store icon name in the click table as well.
Merge branch 'master' of github.com:fionawood/commandmaps