diff --git a/digimarks.py b/digimarks.py
index 4bf60da..e952fa5 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -306,7 +306,6 @@ class Bookmark(BaseModel):
 
     def _set_favicon_with_iconsbetterideaorg(self, domain):
         """ Fetch favicon for the domain """
-        # TODO: if file exists, don't re-download it
         fileextension = '.png'
         meta = requests.head('http://icons.better-idea.org/icon?size=60&url=' + domain, allow_redirects=True, headers={'User-Agent': DIGIMARKS_USER_AGENT})
         if meta.url[-3:].lower() == 'ico':
@@ -329,7 +328,6 @@ class Bookmark(BaseModel):
 
     def _set_favicon_with_realfavicongenerator(self, domain):
         """ Fetch favicon for the domain """
-        # TODO: if file exists, don't re-download it
         response = requests.get(
             'https://realfavicongenerator.p.mashape.com/favicon/icon?platform=android_chrome&site=' + domain,
             stream=True,
@@ -374,6 +372,14 @@ class Bookmark(BaseModel):
         """ Fetch favicon for the domain """
         u = urlparse(self.url)
         domain = u.netloc
+        if os.path.isfile(os.path.join(MEDIA_ROOT, 'favicons/' + domain + '.png')):
+            # If file exists, don't re-download it
+            self.favicon = domain + '.png'
+            return
+        if os.path.isfile(os.path.join(MEDIA_ROOT, 'favicons/' + domain + '.ico')):
+            # If file exists, don't re-download it
+            self.favicon = domain + '.ico'
+            return
         #self._set_favicon_with_iconsbetterideaorg(domain)
         self._set_favicon_with_realfavicongenerator(domain)
 
@@ -963,7 +969,12 @@ def findmissingfavicons(systemkey):
             try:
                 if not bookmark.favicon or not os.path.isfile(os.path.join(MEDIA_ROOT, 'favicons/' + bookmark.favicon)):
                     # This favicon is missing
+                    # Clear favicon, so fallback can be used instead of showing a broken image
+                    bookmark.favicon = None
+                    bookmark.save()
+                    # Try to fetch and save new favicon
                     bookmark.set_favicon()
+                    bookmark.save()
             except OSError as e:
                 print(e)
         return redirect('/')
diff --git a/static/faviconfallback.png b/static/faviconfallback.png
new file mode 100644
index 0000000..69ac5d6
Binary files /dev/null and b/static/faviconfallback.png differ
diff --git a/templates/cards.html b/templates/cards.html
index 1a8bb34..2d95d27 100644
--- a/templates/cards.html
+++ b/templates/cards.html
@@ -5,6 +5,8 @@
             <div class="card-image">
                 {% if bookmark.favicon %}
                     <div><img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" class="favicon" /></div>
+                {% else %}
+                    <div><img src="{{ url_for('static', filename='faviconfallback.png') }}" class="favicon" /></div>
                 {% endif %}
                 {% if bookmark.http_status != 200 and bookmark.http_status != 304 %}
                     <div><i class="small material-icons {{ theme.PROBLEM }}" title="HTTP status {{ bookmark.http_status }}">report_problem</i></div>