Custom badge form uses same label for icon and image

[eviltrout (Robin Ward)]

This should do it:

https://github.com/discourse/discourse/commit/30ebaf6b6a1633be1a7bd1af34978af06eb1ddae