I'm not sure if anyone already mentioned this but the PGD and PGC pins can be left connected to your circuitry while you program the chip in-circuit and no switch is needed.
However for this to work you need to make sure the PGD and PGC pins are not connected to something like a capacitor. Generally if they are connected to your circuitry through a resistor of 2k2 (or higher) there should be no problem with ICSP while leaving those pins connected to the circuitry.