changes for icons and autofocus