re-org of artwork, new icon
merged master