Use PNG for better transparency handling
[FIXED JENKINS-18349 JENKINS-18405]

Integrated the fix toward 1.521.