Trebuchet: Change icon labels option strings

Change-Id: I499ec846bf2c7b2dc1c0d39c2c62a2525412335c
Merge "Trebuchet: Change icon labels option strings" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0