Dandelion root and dandelion leaves can make an infusion or tea that will help with fluid retention.  Just key in either in the search block of your web browser to locate a good remedy.  Look up veria.com which has a great program about herbs and their uses.  The doctor had put me on a water pill and it had slowly became ineffective.  He was talking about increasing the dosage (not a good idea in my book if there is a way around it.)  So I tried the dandelion root and it is pretty bitter but I put it in a daily cup of green tea and use a little extra honey.  Works like a charm.  No more blotted face or fingers that are so thick with water they won't bend.  And best of all, you can pick this stuff out of your own yard and dry it.  So the remedy is cheap.  Just no bug spray on your stash.  God's speed.

 I would note that I had the same symptoms and they recently did a cat scan of my abdomen for a completely different problem and found that I had a kidney stone.  The doctor checked and we reviewed my history.  I had stopped drinking pop because of the health problems and it turns out that the pop had been keeping my excess calcium in check.  When I stopped drinking the pop, the calcium and minerals began to harden into stones.  

Turns out I need to drink a pop a day, and a ton of water.