         // Search the history/favicon view with our limited set of highlight IDs
         // to avoid doing a full table scan on history
         let faviconSearch =
-            "SELECT * FROM view_history_id_favicon WHERE id IN (\(highlightsHistoryIDs))"
+            "SELECT * FROM view_favicons_widest WHERE siteID IN (\(highlightsHistoryIDs))"
 
         let sql = """
             SELECT \(allProjection.joined(separator: ","))
             FROM highlights
             LEFT JOIN (\(faviconSearch)) AS f1 ON
-                f1.id = historyID
+                f1.siteID = historyID
             LEFT OUTER JOIN page_metadata ON
                 page_metadata.cache_key = highlights.cache_key
             """

            SELECT history.id AS historyID, history.url AS url, history.title AS siteTitle, guid, history.domain_id, NULL AS visitDate, 1 AS is_bookmarked
            FROM (\(urisForSimpleSyncedBookmarks))
                LEFT JOIN history ON history.url = bmkUri
                \(removeMultipleDomainsSubquery)
            WHERE
                history.title NOT NULL AND
                history.title != '' AND

    static let PruneHistoryRowCount: UInt = 5000

    // Bookmarks Query
    static let urisForSimpleSyncedBookmarks = """
        SELECT bmkUri FROM bookmarksBuffer WHERE server_modified > ? AND is_deleted = 0
        UNION ALL
