Masculinity- Traits that are BELIEVED to be restricted to men. And what are these traits? Strength, Protectiveness etc.
No matter how hard we argue men and women are equal, the fact that body structures of both the genders are different is true. For me, masculinity is an opportunity for men to utilitize their gender differences for a betterment. Masculinity also refers to responsibilities men have towards women. Be it respecting women in every sphere of life, protecting her or helping her whenever needed.

Femininity- Traits that are BELIEVED to be restricted to women. Examples of such traits include tenderness, affection, being soft-spoken etc.

Gender- noncomformity- Traits which are a mix of masculinity and femininity. This could include being physically strong while being soft spoken. This could also include traits which are common to both the genders like independent, understanding, individualistic, dominant, affectionate etc.