Attached a modified variant of the battery indicator to illustrate my thinking about a consolidated wifi and bluetooth indication.

see the spots above the battery? Those would be wifi and bluetooth. When the hardware is disabled, the corresponding dot would not be there. When on but not in use they would be like shown right now. When in active use they would take on a different color (or they have the color they have in the example, and gray out when powered but not in use).

it will require creating a good deal more icons tho...