Continuation of the refactoring, finally added an icon... TBD