use edit icons, fixes #60
Merge branch 'issue60'