Worklist #20003 - margin fixes and border color