Merge with https://github.com/herpoi/e2-plugin-virtualzappicon