danielpassos Merge pull request #8 from thailekha/FH-2771-include-badge-info-icons …