Fixed highlight stroke and fill