fixed all icon and so on