If you have swelling of hands and feet then you need to have a check by your doctor.
There are a variety of reasons for swollen ankles and feet including high blood pressure, cardiovascular problems, circulation problem, kidney problem and something putting pressure on a major vein (the Inferior vena cava)
Transient swelling could be related to prolonged immobility causing calf muscles failing to pump fluid back into the circulation. Other causes include varicose veins, side-effects of some drugs and being overweight.
A mild diuretic would be the first action, together with compression hosiery.
Keep your legs elevated at a high angle when you can to encourage drainage and if you have a sedentary job ensure that you get up and move around every hour.
Avoid caffeine drinks, but do continue to drink water. Reduce your salt intake too. There is nothing over the counter suitable unless the swelling is only occurring just around the time of your period. In which case there may be some herbal remedies which may help. Your medication is unlikely to be the cause unless you can put a direct relationship between onset of symptoms and starting your tablets.