Merge "Remove obsolete usage of WebIconDatabase"