Little bit more cleanup. icon support. refs #7 refs #8