Adding field icons where relevant. Image field fix