BRANCH 4.2-DEV: fixed some icon related display issues