Harmonization of the behavior of buttons  refs#563