changed icons once again, added some beta code (commented out)