Merge "Update mobile data type icons." into pi-dev