Hide highlight icon when editing an annotation

Noticed a small bug with @dwhly today. The highlighter icon should not show when creating an annotation.
![smallbug](https://cloud.githubusercontent.com/assets/521978/4428739/28d0396c-45d1-11e4-9edc-3dc33931c6b7.jpg)