I've had the same problem too. My doctor told me to keep up the fluids as strangely enough this will help with the problem. Also to try to put your feet up when you can. I'm not sure what you do for work but I sit at a desk all day so I rest my feet on box to keep them elevated and this help. Also when you get home try to stay off your feet, it will help with the swelling as well. I found lying on the couch with my feel proped up on the arm rest perfect! They say to elevate them above your heart.

Hope this helps!