Added mage class and icons