Fixed some item name mappings and added icons.