#7 fixed: "remove system" button added (xmark removed)