now with icons
Merge branch 'master' of https://github.com/kristofvl/HedgeHog