Merge "(bug 40384) Move width/height from button to img"