update icons and fix uncomfortable