Refactoring

* move common code to super-classes
* new icons