Water retention? any natural remedies?

Ive recently increased my water intake. I am urinating alot but my hands and feet are still swollen. im wondering if theres something natural i can take or do? i prop my feet up when they swell to help ease ot because it is painful and annoying and i hold my hands above my head and that seems to help. but i cant alway prop my feet and hold my arms like that.