added additional support for icons and images