i am on the same boat i am 32 weeks my doctor told me that it was all the water that i am retaining that it was goin to go away after baby is born
Grapefruit can help with water retention, adding a fair amount to your diet can help. Also maybe talk to your doctor about wearing a pair of compression socks, they aren't exactly glamorous but if they help maybe you would only have to wear them while at home.
Take barsley water daily before you go to bed.. It will somewhat reduce the swollen areas
With my first pregnancy I had to wear compression socks starting around 30 weeks. Would wear them all day, then take them off at night. Didn't totally fix it, but sure food help.