Change icon and naming