Updated icons

Changed old icons to ###-i and added new class icons.