Improved icns support