Merge "[Title] change the upper folder icon" into 2.0_beta