Improved support for single-box widgets (#2530076)
Improved ButtonCore's handling and preservation of HTML labels