Change editor button design.
Merge branch 'master' into api-1.1