Custom badge form uses same label for icon and image

[codinghorror (Jeff Atwood)]

This is a good point we should update to latest font awesome @eviltrout can you take that?