Merge "Add default icon color and adjust some strings." into mnc-dev