#109 increase xMargin from 5 to 8 for rectangular push buttons