UI abstraction. Fix click handling on buttons without an icon.