diff --git a/app/components/PageTitle.js b/app/components/PageTitle.js
index 537d8690db..435d1e5d95 100644
--- a/app/components/PageTitle.js
+++ b/app/components/PageTitle.js
@@ -19,12 +19,16 @@ const PageTitle = ({ title, favicon }: Props) => {
       <title>
         {team && team.name ? `${title} - ${team.name}` : `${title} - Outline`}
       </title>
-      <link
-        rel="shortcut icon"
-        type="image/png"
-        href={favicon || cdnPath("/favicon-32.png")}
-        sizes="32x32"
-      />
+      {favicon ? (
+        <link rel="shortcut icon" href={favicon} />
+      ) : (
+        <link
+          rel="shortcut icon"
+          type="image/png"
+          href={cdnPath("/favicon-32.png")}
+          sizes="32x32"
+        />
+      )}
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     </Helmet>
   );
diff --git a/app/utils/emoji.js b/app/utils/emoji.js
index f9c9528d4b..14fd5d5006 100644
--- a/app/utils/emoji.js
+++ b/app/utils/emoji.js
@@ -1,23 +1,5 @@
 // @flow
-export function toCodePoint(unicodeSurrogates: string, sep: ?string) {
-  var r = [],
-    c = 0,
-    p = 0,
-    i = 0;
-  while (i < unicodeSurrogates.length) {
-    c = unicodeSurrogates.charCodeAt(i++);
-    if (p) {
-      r.push((0x10000 + ((p - 0xd800) << 10) + (c - 0xdc00)).toString(16));
-      p = 0;
-    } else if (0xd800 <= c && c <= 0xdbff) {
-      p = c;
-    } else {
-      r.push(c.toString(16));
-    }
-  }
-  return r.join(sep || "-");
-}
 
 export function emojiToUrl(text: string) {
-  return `https://twemoji.maxcdn.com/2/72x72/${toCodePoint(text)}.png`;
+  return `data:image/svg+xml;data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>${text}</text></svg>`;
 }