When editing images, I recommend updating the Smile/Pencil icon or separating the features accessed via the icon into separate icons or buttons.
When I edit a file, I typically want to mark it up. When viewing the icons in the editor, it typically takes a second or two for me to determine which icon will get me to where I want to go.
I don't think the Smiley Face should be used in the icon. I imagine for others, the chief features used within it are the mark-up functions (draw and highlight) and the captions.
