New Icons + experimental save state.