These changes also invalidates #7218, as we're no longer using buttons with icons with these changes.