Merge "Only add icons to settings items with icons" into oc-dev