Source modal field width and default value update
Fix source modal icon
Merge branch '1323_source_modal_fixes' into develop