Issue #2330057: Correct comment
Issue #2330057: add icon
Issue #2330057: add server key