diff --git a/app.py b/app.py
index 2b27c81c7af6d962ad42c7a0ae6257446bafe497..8ff30f5714793b0d683716e418c3947ac9f20425 100644
--- a/app.py
+++ b/app.py
@@ -1,4 +1,4 @@
-from flask import Flask, jsonify, render_template, request
+from flask import Flask, jsonify, render_template, request, send_file
 import sqlite3 as sql
 
 # the flask application: uses the webserver imported from the flask module:
@@ -76,6 +76,22 @@ def send_buggy_json():
         {key: val for key, val in buggies if not (val == "" or val is None)}
     )
 
+#-----------------------------------------------------------------------------
+# send the favicon for the buggy editor:
+# This sends the browser an icon image with a cache "time to live" of 24 hours,
+# so you shouldn't see this being requested too often while you're debugging.
+# There's no template here because it's sending a file straight back.
+# (Usually you'd let Flask send images back as static content but this route
+# adds the cache header as a special case).
+#-----------------------------------------------------------------------------
+@app.route("/favicon.png")
+def send_favicon():
+    return send_file(
+        "static/favicon.png",
+        mimetype='image/png',
+        max_age=60*60*24
+    )
+
 #------------------------------------------------------------
 # finally, after all the set-up above, run the app:
 # This listens to the port for incoming HTTP requests, and sends a response
diff --git a/static/favicon.png b/static/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0d77559051c1817db1ddea7bf039bf37090e46a
Binary files /dev/null and b/static/favicon.png differ
diff --git a/templates/base.html b/templates/base.html
index 51e01ae1382d600f16f3909975bb2fcca3dd4249..8d268f27341db7d92aa9865223a1a1cb2acce110 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <link href="static/app.css" media="screen, projector, print" rel="stylesheet" type="text/css" />
+    <link rel="icon" href="/favicon.png" />
   </head>
   <body>
     <div class="main-content">