Fixes related to missing icon and format icon