Patch #815924: Restore ability to pass type= and icon=
2 files changed