Use new logo
Apply changes made in svn (r18365, r18366, r18367)