修改背景，图标
Merge remote-tracking branch 'origin/master'
修改用户图标
Merge remote-tracking branch 'origin/master'