Updated PR from 4144 to fix Icons for Client
Merge pull request #63 from wushin/icon-fix-for-client

Updated PR from 4144 to fix Icons for Client