Should I...

So, I just started using this chore/responsibility chart with my 3.5 year old and so far it's a HUGE success.

I will be changing the dates to numbers 1-7 because I told my kiddo when he gets 7 in a row he will earn a reward. I also told him that when he doesn't do/fails to do one of the chores/responsibilities he will lose a star.

My question is, should I take away any stars or just matching stars?

For example, say he has 1 potty star and 1 listen star. He fails to use the potty and goes pee in his diaper, so I take away the potty star. And later on he goes pee in his diaper again, but only star left to take away is listen star. So, do I take away the listen star...

I am leaning towards yes, and taking away stars regardless of if they match the action or not.

Opinions and suggestions are VERY welcomed.

Thank you.