Use distinctive icons instead of only colour, add proper handling of labels (hidden or visible, but always present) with optional custom text.