Revamp icon, so it's not stored 5 times