fixes for M3, started with svg images
fixes for M3, started with svg images