add icons
display hipster icon
resolve conflict, shrink tooltip