Remove all images.
Add category icons.
Add category name matching logic.