improved icon handling a little.