Merge "Switch settings provider to use the new Settings icon" into klp-dev