how to get rid of excess water retention??

hello all I'm 18 weeks and I'm starting to get the horrible water retention! puffy hands, feet, face, wrists, ugh! I drink tons of water (8-10 bottles a day) and my blood pressure is normal and it is monitored daily. I try to avoid salty foods and I mostly eat fruit or salad anyways. this has just now started and it was really noticable and bad Friday when I worked 6 hours and was constantly standing and stocking the racks. any tips? I've heard coffee helps and exercise but when I work out, my hands and feet swell so bad!!!