Restored the old icons until the new set is ready
Improved error management