Add count for number of options and Format icons