Fixes for submit images functionality
merging with Max's cahnges to icon