fixes #2335 Form Icon missing in edit mode

Fixed the issue and committed code for review please check it.