Updated PR from 4144 to fix Icons for Client