upgrade versions, and fix icon compilation
merge