Added first pass of icon use