slightly more elegant icon handling.