Add icons and flags