Use icons, closes #2