[ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.

PHPBB3-12155
[ticket/12155] Get rid of line-height value causing alignment issues in FF.

PHPBB3-12155