revert new icons and editing controls changes