Highlight tool should show current colour, not just yellow

As per title.

Sometimes I choose red or blue and will revisit an open document a few hours later to highlight again expecting yellow, since that’s the permanent colour of the tool button… It’s just a bit misleading sometimes and would be nice if it corresponded to the current colour you have selected.