Cleanup and fix icon key.