code fixes for icon name changes