Working on adding icons