DocAppIcon unified upgrade

Converted to unified api. Fixed errors.