Fixed up Toolbar modes to work, and removed some images files not needed