NMS-6995 replaced with LGPL images
format
clean up some deprecation warnings