Fix for #1648 - buttons with pre or postfix not rendering text correctly.