Minor bug fixes.  Fixed double icon problem.