Added support for item icons and tags for them.