changed comments handling to also use icons instead of texts