bugfixes for new icons and editing contols