remove underline from links

There is an underline feature in the text box. 

If a text is highlighted and used as a link, it is automatically underlined. 
By selecting and clicking on the underline icon in the text box, and clicking it on or off, this does not remove the underline. 

Please allow the underline icon to BOTH ADD AND REMOVE the underline in a LINKED text. 

Thank you...