Armor and mix table icon fixes