Adding demo/fix for buttons with icons + text.