Removed badge span

Removed bootstrap badge in order to have more styling control on remove
icon.