fixed logo lookup and condition for default logo.
Merge pull request #1329 from veroc/3495_1

fixed logo lookup and condition for default logo.