Close #36.  Icons for #17