Adding support for further indicators / extensions
adding small icon
updated description