fixbug:can not choose iconset with background
Merge branch 'dev' into uc