Right icon and bugfixes