Issue #556 - fixing icons