Use <span> rather than <img> so that font-icons can be used, fixes #16699.   In general the layout is like before, except I had to hack a margin-bottom setting for the arrows on !PopupMenuItems, to get their height (relative to the text) correct.