Fix icon and stuff