diff --git a/app/profile_images.js b/app/profile_images.js
index ee39ee3a9..7cbc9b4c5 100644
--- a/app/profile_images.js
+++ b/app/profile_images.js
@@ -1,7 +1,6 @@
 const fs = require('fs');
 const mkdirp = require('mkdirp');
 const path = require('path');
-const Identicon = require('identicon.js');
 const sha224 = require('js-sha512').sha512_224;
 
 const { app } = require('electron').remote;
@@ -13,14 +12,6 @@ mkdirp.sync(PATH);
 const hasImage = pubKey => fs.existsSync(getImagePath(pubKey));
 
 const getImagePath = pubKey => `${PATH}/${pubKey}.png`;
-const getOrCreateImagePath = pubKey => {
-  // If the image doesn't exist then create it
-  if (!hasImage(pubKey)) {
-    return generateImage(pubKey);
-  }
-
-  return getImagePath(pubKey);
-};
 
 const removeImage = pubKey => {
   if (hasImage(pubKey)) {
@@ -41,24 +32,14 @@ const removeImagesNotInArray = pubKeyArray => {
     .forEach(i => removeImage(i));
 };
 
-const generateImage = pubKey => {
+const writePNGImage = (base64String, 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,
-    background: [0, 0, 0, 0],
-  }).toString();
-  fs.writeFileSync(imagePath, png, 'base64');
+  fs.writeFileSync(imagePath, base64String, 'base64');
   return imagePath;
-};
+}
 
 module.exports = {
-  generateImage,
+  writePNGImage,
   getOrCreateImagePath,
   getImagePath,
   hasImage,
diff --git a/js/models/conversations.js b/js/models/conversations.js
index dff8043fa..2a75f8949 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -309,11 +309,15 @@
     },
 
     async updateProfileAvatar() {
-      if (this.isRss()) {
+      if (this.isRss() || this.isPublic()) {
         return;
       }
-      const path = profileImages.getOrCreateImagePath(this.id);
-      await this.setProfileAvatar(path);
+
+      // Remove old identicons
+      if (profileImages.hasImage(this.id)) {
+        profileImages.removeImage(this.id);
+        await this.setProfileAvatar(null);
+      }
     },
 
     async updateAndMerge(message) {
diff --git a/package.json b/package.json
index b055f5039..f3a349e66 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "buffer-crc32": "0.2.13",
     "bunyan": "1.8.12",
     "classnames": "2.2.5",
+    "color": "^3.1.2",
     "config": "1.28.1",
     "electron-context-menu": "^0.15.0",
     "electron-editor-context-menu": "1.1.1",
@@ -76,7 +77,6 @@
     "google-libphonenumber": "3.2.2",
     "got": "8.2.0",
     "he": "1.2.0",
-    "identicon.js": "2.3.3",
     "intl-tel-input": "12.1.15",
     "jquery": "3.3.1",
     "js-sha512": "0.8.0",
@@ -122,6 +122,7 @@
   "devDependencies": {
     "@types/chai": "4.1.2",
     "@types/classnames": "2.2.3",
+    "@types/color": "^3.0.0",
     "@types/config": "0.0.34",
     "@types/filesize": "3.6.0",
     "@types/fs-extra": "5.0.5",
diff --git a/yarn.lock b/yarn.lock
index 20f42cec8..72d1e6646 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -89,6 +89,25 @@
   resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
   integrity sha512-x15/Io+JdzrkM9gnX6SWUs/EmqQzd65TD9tcZIAQ1VIdb93XErNuYmB7Yho8JUCE189ipUSESsWvGvYXRRIvYA==
 
+"@types/color-convert@*":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-1.9.0.tgz#bfa8203e41e7c65471e9841d7e306a7cd8b5172d"
+  integrity sha512-OKGEfULrvSL2VRbkl/gnjjgbbF7ycIlpSsX7Nkab4MOWi5XxmgBYvuiQ7lcCFY5cPDz7MUNaKgxte2VRmtr4Fg==
+  dependencies:
+    "@types/color-name" "*"
+
+"@types/color-name@*":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/color@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.0.tgz#40f8a6bf2fd86e969876b339a837d8ff1b0a6e30"
+  integrity sha512-5qqtNia+m2I0/85+pd2YzAXaTyKO8j+svirO5aN+XaQJ5+eZ8nx0jPtEWZLxCi50xwYsX10xUHetFzfb1WEs4Q==
+  dependencies:
+    "@types/color-convert" "*"
+
 "@types/config@0.0.34":
   version "0.0.34"
   resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0"
@@ -1733,11 +1752,18 @@ color-convert@^1.9.0:
   dependencies:
     color-name "^1.1.1"
 
+color-convert@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
 color-convert@~0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
 
-color-name@^1.0.0, color-name@^1.1.1:
+color-name@1.1.3, color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
@@ -1748,6 +1774,14 @@ color-string@^0.3.0:
   dependencies:
     color-name "^1.0.0"
 
+color-string@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
+  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
 color@^0.11.0:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
@@ -1757,6 +1791,14 @@ color@^0.11.0:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
+color@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
+  integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==
+  dependencies:
+    color-convert "^1.9.1"
+    color-string "^1.5.2"
+
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -4480,11 +4522,6 @@ 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.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -4669,6 +4706,11 @@ is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
@@ -8640,6 +8682,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
 single-line-log@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364"