Adding Icon support and other modifications.