Adding icons handling

review1033002
Do not set values of keys in modified fields

review1030002