Redid clobbered fix.
Attempt to merge back in break point code.
Added back icon