Merge "New plus/minus buttons in Editor"