Updated roles and icons