comment fix and icon fix.