Bug 1063914 - Restore edit mode's [x] icons (r=mcomella)