Merge "replaced toolkit pushbutton images with shorter images." into devel/master