Make TreeBadge a proper label
Tweak status icon