Chrome cleanup and CMI icons - fixes #593