#3140 more fix
#3180 fix the icon
#3181 fixed icon and language