Stock icon handling fixes.