clientbuttons adaptions for 3.5