Separated the block and item icons, here's hoping I can fix the Basic Wand looking like a leather cap.