Don't needlessly update fields if we never actually found an icon. Eliminates some infinite loops on callbacks.
Don't needlessly update fields if we never actually found an icon.
Eliminates some infinite loops on callbacks.

jordemort/e17,jordemort/e17,jordemort/e17