MT#5879 Replace buttons a little.