fix some typos and ensure icon shown in the context menu