Added better support for remote icons and pictures.