To celebrate NBPD, Sue Kerr, at the Pittsburgh Lesbian Correspondents blog, posted (as many other people doubtless did) a picture of Srinidhi Seshadri's NonBinary Umbrella.
Right click, Save Image As...

Okay, you might consider the “gender non-conforming” bubble to be pushing at the boundaries of non-binary somewhat. Pretty much everyone is gender non-conforming to some degree, and that gender non-conformity doesn't mean they're all non-binary. They're not.
But that's the thing about metaphorical umbrellas. You're not compelled to stand under them, yet they shelter whomsoever chooses to do so, without fear or favour. So if a gender non-conforming person wants to stand under this particular umbrella, the open-ended inclusivity of its description indicates that they can.
As for me, looking at once to the genderqueer bubble – the definition there isn't one I'd use. I prefer it looser, as in my post from 2015: someone whose gender is "queer" in some way, without specifying how. Then I read the non-binary headline and its “neither entirely male nor entirely female”.
Hitherto, I've ummed and ahed about claiming a non-binary identity, seeing it as a not-at-all-binary type thing. So the words “not entirely” are like a gift. So yes, still a bit binary, still male, partially, sort of, but no, not entirely.
That suits me just fine :)