ICSP CLK/DAT & my 2 buttons
If I understand correctly, you want to support ICSP, and once the target is programmed, you want the buttons to function normally. 

In that case, simply modify your Arduino programmer to set it's CLK and DAT lines as inputs, effectively removing them from the system. Now your target can set up it's inputs as it wants, which in this case is probably with pullups.