fix switching and ceiling icons

closes #712
closes #655