Restore the original icon and label positioning approach.

Now again actually looks at the theme element's frame margins
to shift things around and size things.

Unbreaks:
- When exactly multi-line wrapping occurs.
- Relative alignment between text and icons.


Please move changes to this through RB next time :)

Breeze has to be tweaked a little for nice results, commit
following.