Merge "Update Wifi Preferences with custom icons." into oc-dev