bugfixes + changed icons