diff --git a/app/profile_images.js b/app/profile_images.js
index 94323a957..b99c5f938 100644
--- a/app/profile_images.js
+++ b/app/profile_images.js
@@ -1,20 +1,8 @@
 const fs = require('fs');
 const mkdirp = require('mkdirp');
 const path = require('path');
-const jdenticon = require('jdenticon');
-
-// Icon config
-jdenticon.config = {
-  lightness: {
-      color: [0.40, 0.80],
-      grayscale: [0.30, 0.90],
-  },
-  saturation: {
-      color: 0.50,
-      grayscale: 0.00,
-  },
-  backColor: '#86444400',
-};
+const Identicon = require('identicon.js');
+const sha224 = require('js-sha512').sha512_224;
 
 const { app } = require('electron').remote;
 
@@ -22,34 +10,15 @@ const userDataPath = app.getPath('userData');
 const PATH = path.join(userDataPath, 'profileImages');
 mkdirp.sync(PATH);
 
-function hashCode(s) {
-  let h = 0;
-  for(let i = 0; i < s.length; i += 1)
-      h = Math.imul(31, h) + s.charCodeAt(i) | 0;
-
-  return h;
-}
-
 const hasImage = pubKey => fs.existsSync(getImagePath(pubKey));
 
 const getImagePath = pubKey => `${PATH}/${pubKey}.png`;
 const getOrCreateImagePath = pubKey => {
-  const imagePath = getImagePath(pubKey);
-
   // If the image doesn't exist then create it
-  if (!hasImage(pubKey)) {
-    /*
-      We hash the pubKey and then pass that into jdenticon
-      This is because if we pass pubKey directly,
-      jdenticon trims the string and then generates a hash
-      meaning public keys with the same characters at the beginning
-      will get the same images
-    */
-    const png = jdenticon.toPng(hashCode(pubKey), 50, 0.12);
-    fs.writeFileSync(imagePath, png);
-  }
+  if (!hasImage(pubKey))
+    return generateImage(pubKey);
 
-  return imagePath;
+  return getImagePath(pubKey);
 };
 
 const removeImage = pubKey => {
@@ -58,10 +27,38 @@ const removeImage = pubKey => {
   }
 }
 
+const removeImagesNotInArray = pubKeyArray => {
+  fs.readdirSync(PATH)
+    // Get all files that end with png
+    .filter(file => file.includes('.png'))
+    // Strip the extension
+    .map(i => path.basename(i, '.png'))
+    // Get any file that is not in the pubKeyArray
+    .filter(i => !pubKeyArray.includes(i))
+    // Remove them
+    .forEach(i => removeImage(i));
+}
+
+const generateImage = pubKey => {
+  const imagePath = getImagePath(pubKey);
+
+  /*
+    We hash the pubKey and then pass that into Identicon.
+    This is to avoid getting the same image
+      if 2 public keys start with the same 15 characters.
+  */
+  const png = new Identicon(sha224(pubKey), {
+    margin: 0.2,
+  }).toString();
+  fs.writeFileSync(imagePath, png, 'base64');
+  return imagePath
+}
+
 module.exports = {
+  generateImage,
   getOrCreateImagePath,
   getImagePath,
   hasImage,
   removeImage,
-  hashCode,
+  removeImagesNotInArray,
 };
diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index c0182a696..54ca0f89c 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -261,6 +261,9 @@
           });
           await Promise.all(promises);
 
+          // Remove any unused images
+          window.profileImages.removeImagesNotInArray(conversations.map(c => c.id));
+
           window.log.info('ConversationController: done with initial fetch');
         } catch (error) {
           window.log.error(
diff --git a/js/models/conversations.js b/js/models/conversations.js
index ea54d7022..43a780a47 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -178,7 +178,7 @@
     },
 
     async updateProfileAvatar() {
-      const path = profileImages.getOrCreateImagePath(this.id);
+      const path = await profileImages.getOrCreateImagePath(this.id);
       await this.setProfileAvatar(path);
     },
 
diff --git a/package.json b/package.json
index f31235ccf..ef51ba443 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,8 @@
     "glob": "^7.1.2",
     "google-libphonenumber": "^3.0.7",
     "got": "^8.2.0",
+    "identicon.js": "^2.3.3",
     "intl-tel-input": "^12.1.15",
-    "jdenticon": "^2.1.0",
     "jquery": "^3.3.1",
     "js-sha512": "^0.8.0",
     "jsbn": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index c8b150c9c..4bbcad44e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1575,11 +1575,6 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000912.tgz#29c739d8c8fae006de61b51f547bdbf02f5d867e"
   integrity sha512-uiepPdHcJ06Na9t15L5l+pp3NWQU4IETbmleghD6tqCqbIYqhHSu7nVfbK2gqPjfy+9jl/wHF1UQlyTszh9tJQ==
 
-canvas-renderer@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/canvas-renderer/-/canvas-renderer-2.0.1.tgz#0124a39b2022010d3a3533225da5f4a0aa08263d"
-  integrity sha512-K2mOGkMN9je/GCm9JSg7llrlLr9hMHTnWsO5xQEZ5sRz+HjfQ92u8jnKIQZj1GXfJBJKAotPISyNls6IFvfWpg==
-
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
@@ -4739,6 +4734,11 @@ icss-utils@^2.1.0:
   dependencies:
     postcss "^6.0.1"
 
+identicon.js@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/identicon.js/-/identicon.js-2.3.3.tgz#c505b8d60ecc6ea13bbd991a33964c44c1ad60a1"
+  integrity sha512-/qgOkXKZ7YbeCYbawJ9uQQ3XJ3uBg9VDpvHjabCAPp6aRMhjLaFAxG90+1TxzrhKaj6AYpVGrx6UXQfQA41UEA==
+
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
@@ -5406,13 +5406,6 @@ javascript-stringify@^1.6.0:
   resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3"
   integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=
 
-jdenticon@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/jdenticon/-/jdenticon-2.1.0.tgz#a94f0434d3537d66a831502a6e6e593b186515fb"
-  integrity sha512-EL3MgPHRg1/agDNuht5yYzjiY/F2VEoQrnMazTBRJiykZdRGbAiGDi8dXZw0cFYPn1xAGurGojUnR+HfJg1Ziw==
-  dependencies:
-    canvas-renderer "~2.0.1"
-
 jimp@^0.2.27:
   version "0.2.28"
   resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz#dd529a937190f42957a7937d1acc3a7762996ea2"