bugfixing and icons changes