Next time your partner really ticks you off, react differently. Instead of yelling at him/her or giving him/her the cold shoulder, pick up one of your softest pillows and start a pillow fight. (*Please remember your own strength and don't injure your love.)
If you do this with love behind it, you should both end up laughing and giggling instead of just being madder at one another. It may not resolve the problem, but it can lighten the mood!