add icons and images support.
fix images