Add icons to tags and labels
Merge conflict in gamesession_list