Merge pull request #4930 from darkdh/4882

Import favicon fix:

app/importer.js

@@ -171,16 +171,21 @@ importer.on('add-bookmarks', (e, bookmarks, topLevelFolder) => {
 importer.on('add-favicons', (e, detail) => {
   let faviconMap = {}
   detail.forEach((entry) => {
-    if (entry.favicon_url.startsWith('made-up-favicon:')) {
-      faviconMap[entry.urls[0]] = entry.png_data
+    if (entry.favicon_url.includes('made-up-favicon')) {
+      for (let url of entry.urls) {
+        faviconMap[url] = entry.png_data
+      }
     } else {
-      faviconMap[entry.urls[0]] = entry.favicon_url
+      for (let url of entry.urls) {
+        faviconMap[url] = entry.favicon_url
+      }
     }
   })
   let sites = AppStore.getState().get('sites')
   sites = sites.map((site) => {
-    if (site.get('favicon') === undefined && site.get('location') !== undefined &&
-      faviconMap[site.get('location')] !== undefined) {
+    if ((site.get('favicon') === undefined && site.get('location') !== undefined &&
+      faviconMap[site.get('location')] !== undefined) ||
+      (site.get('favicon') !== undefined && site.get('favicon').includes('made-up-favicon'))) {
       return site.set('favicon', faviconMap[site.get('location')])
     } else {
       return site