icons, donut & circle icons, pointer class, some refactoring