icon/text improvements