Patch Set 1: Looks good to me, but someone else must approve

Anyone think we can accomplish this better via a icon decoration versus a label decoration? Other than that, I'm fine with this change.