New Item Icons + Fix Vivillon Icons
Merge pull request #1275 from Fuzzysqurl/bugs

New Item Icons + Fix Vivillon Icons