2/3/14 - Clean up, maping icons