Icon change. Reorganization of the code; too much to do.