New Editor class and Icon update