Support icon and better matching