Refactored Icon and Status status to dedicated classes

This will let the user get the same icon in both the notification field and in-app, fixing issue #211