icon and language formatting, see discussion pull #372 

see discussion pull #372