This makes the icon and text a single item, so they don't split across lines, and reduces code and messages. Bug: 47398 Change-Id: If81313b9fe03693dcdc06d5d682f0ef9a9994f76