[FIXED JENKINS-17988] Use appropriate icon construction methods

See [JENKINS-17988](https://issues.jenkins-ci.org/browse/JENKINS-17988) for background.