diff --git a/r2/r2/public/static/defaultapp.png b/r2/r2/public/static/defaultapp.png
new file mode 100644
index 000000000..c9cacaeb0
Binary files /dev/null and b/r2/r2/public/static/defaultapp.png differ
diff --git a/r2/r2/templates/oauth2authorization.html b/r2/r2/templates/oauth2authorization.html
index 35de75324..89ef70212 100644
--- a/r2/r2/templates/oauth2authorization.html
+++ b/r2/r2/templates/oauth2authorization.html
@@ -24,11 +24,16 @@
    from r2.lib.template_helpers import static, s3_https_if_secure
 %>
 <%namespace file="utils.html" import="_md" />
+<%
+   if thing.client.icon_url:
+     icon = s3_https_if_secure(thing.client.icon_url)
+   else:
+     icon = static("defaultapp.png")
+%>
 <div class="content oauth2-authorize">
   <div class="icon">
     &nbsp;
-    <img src="${s3_https_if_secure(thing.client.icon_url)}"
-         alt="${thing.client.name} icon" />
+    <img src="${icon}" alt="${thing.client.name} icon" />
     &nbsp;
   </div>
   %if thing.client.about_url:
diff --git a/r2/r2/templates/prefapps.html b/r2/r2/templates/prefapps.html
index 3113f8caa..2919f5d88 100644
--- a/r2/r2/templates/prefapps.html
+++ b/r2/r2/templates/prefapps.html
@@ -1,3 +1,7 @@
+<%!
+  from r2.lib.template_helpers import static
+%>
+
 <%namespace name="utils" file="utils.html" />
 <%namespace file="utils.html" import="error_field, plain_link" />
 <%namespace file="printablebuttons.html" import="ajax_ynbutton, ynbutton" />
@@ -5,7 +9,7 @@
 <%def name="icon(app)">
   <div class="app-icon">
     &nbsp;
-    <img src="${app.icon_url}">
+    <img src="${app.icon_url or static('defaultapp.png')}">
     &nbsp;
   </div>
 </%def>