More Work on icons