Added black icon and preference option to use black or color icon
adding modified files, which I should have added before
Clean up a bit and default to color icon