Merge "change setting icon patchset2. change icon." into 2.0_beta