replace icon, reorganize button