more fixes in icon mapping