Craig - add icons
Craig - merge
Craig - build