Property Set icon fixes
Property Set icon fixes

* origin/pr/11431:
  Property Set icon fixes