fixes some issues with #197

- icons were sometimes added twice
- new annotation icon
Merge remote-tracking branch 'origin/ribbons' into ribbons
Merge remote-tracking branch 'origin/ribbons' into ribbons