better handling of icons