Make the icons for Annotate and Highlight in the adder toolbar
consistent with the sidebar by replacing the icon font icons with the
`SvgIcon` component.

Adjust the vertical margin between the icon and the label slightly as
the new Highlight icon and label look too close otherwise.