Issue #428 - fixing icons