fix for icons and editing