Blender Git Loki

Fix T47158: Labels w/ icons use button text color

Icon buttons with text labels now use the same color as labels.

This was causing problems with theming since there was no way to set color
for all labels without also changing button text color.