Form Widget icon spacing fix (DT-1241)