diff --git a/.jpmignore b/.jpmignore
index 0fc6d0e..100666b 100644
--- a/.jpmignore
+++ b/.jpmignore
@@ -5,12 +5,13 @@ node_modules/
 
 .env
 .eslintrc.js
+.eslintignore
 .gitignore
 .htmllintrc
 .jpmignore
 .stylelintrc
 .travis.yml
-testpilot-containers.xpi
+*.xpi
 .vimrc
 .DS_Store
 .gdb_history
diff --git a/README.md b/README.md
index f0194d6..7c8b6a8 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,20 @@ The only way to run the experiment is using an [unbranded version build](https:/
 Check out the [Browser Toolbox](https://developer.mozilla.org/en-US/docs/Tools/Browser_Toolbox) for more information about debugging add-on code.
 
 
+### Building .xpi
+
+To build a local .xpi, use the plain [`jpm
+xpi`](https://developer.mozilla.org/en-US/Add-ons/SDK/Tools/jpm#jpm_xpi) command.
+
+### Signing an .xpi
+
+To sign an .xpi, use [`jpm
+sign`](https://developer.mozilla.org/en-US/Add-ons/SDK/Tools/jpm#jpm_sign)
+command.
+
+Note: You will need to be [an author on the AMO
+add-on](https://addons.mozilla.org/en-US/developers/addon/containers-experiment/ownership).
+
 ### Testing
 TBD
 
diff --git a/data/usercontext.css b/data/usercontext.css
index c9c2d80..911743f 100644
--- a/data/usercontext.css
+++ b/data/usercontext.css
@@ -86,6 +86,22 @@ value, or chrome url path as an alternate selector mitiages this bug.*/
   --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#food");
 }
 
+[data-identity-icon="fruit"] {
+  --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#fruit");
+}
+
+[data-identity-icon="pet"] {
+  --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#pet");
+}
+
+[data-identity-icon="tree"] {
+  --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#tree");
+}
+
+[data-identity-icon="chill"] {
+  --identity-icon: url("resource://testpilot-containers/data/usercontext.svg#chill");
+}
+
 #userContext-indicator {
   height: 16px;
   width: 16px;
diff --git a/data/usercontext.svg b/data/usercontext.svg
index 3237e98..f58067a 100644
--- a/data/usercontext.svg
+++ b/data/usercontext.svg
@@ -50,5 +50,23 @@
   <path id="food" d="M14.1,0.9v5.3h-1.4V0.9c0-1.1-1.4-1.1-1.4,0v5.3h-1.2V0.9c0-1.1-1.4-1.1-1.4,0v5.3H7.2V0.9c0-1.2-1.6-1.1-1.6,0
   v10.4c0,1.8,1.2,3,2.8,3v15.2c0,1.6,1.1,2.5,2.1,2.5s2.1-0.9,2.1-2.5V14.3c1.6,0,2.8-1.4,2.8-2.8V0.9C15.6-0.4,14.1-0.2,14.1,0.9z
    M19.8,3.7v25.8c0,3.2,4.2,3.2,4.2,0V17.1h2.3V3.7C26.5-1.2,19.8-1.2,19.8,3.7z"/>
+  <path id="fruit" d="M16.5,8c-2.1-0.9-3.9-1.2-6.6-0.9C4.6,8,1.8,12.6,1.8,18c0,5.9,4.8,14,9.8,14c1.6,0,3.9-1.2,4.4-1.2
+  c0.5,0,2.8,1.2,4.4,1.2c5,0,9.8-8.4,9.8-14c0-5.9-3.2-10.8-9.8-10.8C19,7.1,17.8,7.5,16.5,8z M11.7,0c1.1,0.2,3.2,0.9,4.1,2.3
+  c0.9,1.4,0.5,3.6,0.2,4.6c-1.2-0.2-3.2-0.7-4.1-2.3C11,3.2,11.4,1.1,11.7,0L11.7,0z"/>
+  <path id="pet" d="M28.5,8.1c0-1.1-1-1.9-2.1-2.4V3.7c-0.2-0.2-0.3-0.3-0.6-0.3c-0.6,0-1.1,0.8-1.3,2.1c-0.2,0-0.3,0-0.5,0l0,0
+  c0-0.2,0-0.3-0.2-0.5c-0.3-1.1-0.8-1.9-1.3-2.6C22,2.6,21.7,3.2,21.7,4L22,6.3c-0.3,0.2-0.6,0.3-1,0.6l-3.5,3.7l0,0
+  c0,0-6.3-0.8-10.9,0.2c-0.6,0-1,0.2-1.1,0.3c-0.5,0.2-0.8,0.3-1.1,0.6c-1.1-0.8-2.2-2.1-3.2-4c0-0.3-0.5-0.5-0.8-0.5s-0.5,0.6-0.3,1
+  c0.8,2.1,2.1,3.5,3.4,4.5c-0.5,0.5-0.8,1-1,1.6c0,0-0.3,2.2-0.3,5.5l1.4,8c0,1,0.8,1.8,1.9,1.8c1,0,1.9-0.8,1.9-1.8V23l0.5-1.3h8.8
+  l0.8,1.3v4.7c0,1,0.8,1.8,1.9,1.8c1,0,1.6-0.6,1.8-1.4l0,0l1.9-9l0,0l2.1-6.4h3c3.4,0,3.7-2.9,3.7-2.9L28.5,8.1z"/>
+  <path id="tree" d="M0.7,18c0,4.9,3.6,8.8,8.1,9.5v4.3c0.2,0,3.2,0,3.2,0v-4.3c1.8-0.4,3.6-1.1,4.9-2.5c0.2-0.2,0.2-0.2,0.2-0.5
+  c-0.2-0.4-0.2-1.1-0.2-1.6c0-2,0.2-4.9,1.6-7.9c0,0,0.9-1.6,0.7-1.8C18,7.2,14.4,0,10.4,0C5,0,0.7,12.6,0.7,18z M18.3,22.8
+  c0,3.1,2.2,5.6,4.9,6.3V32h3.2v-2.9c2.7-0.7,4.9-3.2,4.9-6.3c0-3.6-2.9-12.9-6.5-12.9S18.3,19.2,18.3,22.8z"/>
+  <path id="chill" d="M9.1,18.5l-5.7,5.9C3.2,23.8,3,23.3,3,22.6c0-2.5,2-4.4,4.4-4.4C7.8,18.1,8.5,18.3,9.1,18.5 M26.5,18.5l-5.7,5.9
+  c-0.2-0.5-0.4-1.1-0.4-1.8c0-2.5,2-4.4,4.4-4.4C25.4,18.1,26,18.3,26.5,18.5 M24.7,2L24.7,2c-0.7,0-1.4,0.7-1.4,1.4s0.7,1.4,1.4,1.4
+  c2.5,0,4.4,2,4.4,4.4v7.6c-1.6-1.2-3.6-1.8-5.5-1.4c-2.1,0.4-3.9,1.6-5,3.4c-1.6-1.2-3.9-1.2-5.5,0c-1.1-1.8-2.8-3-5-3.4
+  c-2-0.4-3.9,0.2-5.5,1.4V9.2c0-2.5,2-4.4,4.4-4.4c0.5,0,0.9-0.4,1.2-0.7c0.2-0.4,0.2-0.9,0-1.4C8.2,2.3,7.6,2,7.1,2
+  C3.2,2,0,5.2,0,9.2v13.5C0,26.7,3.2,30,7.1,30l0,0c3.9,0,7.1-3.2,7.1-7.3c0-0.2,0-0.4,0-0.5c0.2-0.9,0.9-1.4,1.8-1.4
+  s1.6,0.5,1.8,1.4v0.2c0,0.2,0,0.2,0,0.4c0,2,0.7,3.7,2.1,5c1.4,1.4,3,2.1,5,2.1l0,0c2,0,3.6-0.7,5-2.1c1.4-1.2,2.1-3.2,2.1-5V9.2
+  C32,5.2,28.8,2,24.7,2"/>
   <circle id="circle" r="16" cx="16" cy="16" fill-rule="evenodd"/>
 </svg>
diff --git a/index.js b/index.js
index f01122f..87442e7 100644
--- a/index.js
+++ b/index.js
@@ -27,6 +27,10 @@ const IDENTITY_ICONS = [
   { name: "gift", image: "gift" },
   { name: "vacation", image: "vacation" },
   { name: "food", image: "food" },
+  { name: "fruit", image: "fruit" },
+  { name: "pet", image: "pet" },
+  { name: "tree", image: "tree" },
+  { name: "chill", image: "chill" },
   { name: "circle", image: "circle" }, // this doesn't exist in m-b
 ];
 
@@ -243,22 +247,22 @@ const ContainerService = {
           color: "",
           name: "Pending to be deleted",
           public: true,
-        }
+        };
       }
 
       return identity;
     }
 
-    let oldGetIdentityFromId = ContextualIdentityService.getIdentityFromId;
+    const oldGetIdentityFromId = ContextualIdentityService.getIdentityFromId;
     ContextualIdentityService.getIdentityFromId = function(userContextId) {
       return workaroundForCookieManager(oldGetIdentityFromId, userContextId);
-    }
+    };
 
     if ("getPublicIdentityFromId" in ContextualIdentityService) {
-      let oldGetPublicIdentityFromId = ContextualIdentityService.getIdentityFromId;
+      const oldGetPublicIdentityFromId = ContextualIdentityService.getIdentityFromId;
       ContextualIdentityService.getIdentityFromId = function(userContextId) {
         return workaroundForCookieManager(oldGetPublicIdentityFromId, userContextId);
-      }
+      };
     }
     // End-Of-Hack
   },
diff --git a/package.json b/package.json
index 18f560b..eb0180f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "testpilot-containers",
   "title": "Containers Experiment",
   "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/testpilot-containers/issues"
@@ -44,5 +44,6 @@
     "lint:html": "htmllint webextension/*.html",
     "lint:js": "eslint .",
     "test": "npm run lint"
-  }
+  },
+  "updateURL": "https://testpilot.firefox.com/files/@testpilot-containers/updates.json"
 }
diff --git a/webextension/css/popup.css b/webextension/css/popup.css
index cdb0a99..3b0498b 100644
--- a/webextension/css/popup.css
+++ b/webextension/css/popup.css
@@ -37,18 +37,18 @@ table {
 
 /* Color and icon helpers */
 [data-identity-color="blue"] {
-  --identity-tab-color: #0996f8;
-  --identity-icon-color: #00a7e0;
+  --identity-tab-color: #37adff;
+  --identity-icon-color: #37adff;
 }
 
 [data-identity-color="turquoise"] {
-  --identity-tab-color: #01bdad;
-  --identity-icon-color: #01bdad;
+  --identity-tab-color: #00c79a;
+  --identity-icon-color: #00c79a;
 }
 
 [data-identity-color="green"] {
-  --identity-tab-color: #57bd35;
-  --identity-icon-color: #7dc14c;
+  --identity-tab-color: #51cd00;
+  --identity-icon-color: #51cd00;
 }
 
 [data-identity-color="yellow"] {
@@ -57,23 +57,23 @@ table {
 }
 
 [data-identity-color="orange"] {
-  --identity-tab-color: #ff9216;
-  --identity-icon-color: #ff9216;
+  --identity-tab-color: #ff9f00;
+  --identity-icon-color: #ff9f00;
 }
 
 [data-identity-color="red"] {
-  --identity-tab-color: #d92215;
-  --identity-icon-color: #d92215;
+  --identity-tab-color: #ff613d;
+  --identity-icon-color: #ff613d;
 }
 
 [data-identity-color="pink"] {
-  --identity-tab-color: #ea385e;
-  --identity-icon-color: #ee5195;
+  --identity-tab-color: #ff4bda;
+  --identity-icon-color: #ff4bda;
 }
 
 [data-identity-color="purple"] {
-  --identity-tab-color: #7a2f7a;
-  --identity-icon-color: #7a2f7a;
+  --identity-tab-color: #af51f5;
+  --identity-icon-color: #af51f5;
 }
 
 [data-identity-icon="fingerprint"] {
@@ -108,6 +108,22 @@ table {
   --identity-icon: url("/img/usercontext.svg#vacation");
 }
 
+[data-identity-icon="fruit"] {
+  --identity-icon: url("/img/usercontext.svg#fruit");
+}
+
+[data-identity-icon="pet"] {
+  --identity-icon: url("/img/usercontext.svg#pet");
+}
+
+[data-identity-icon="tree"] {
+  --identity-icon: url("/img/usercontext.svg#tree");
+}
+
+[data-identity-icon="chill"] {
+  --identity-icon: url("/img/usercontext.svg#chill");
+}
+
 /* Buttons */
 .button.primary {
   background-color: #0996f8;
@@ -520,6 +536,11 @@ span ~ .panel-header-text {
   opacity: 0 !important;
 }
 
+.edit-container-panel [type="radio"] {
+  display: inline;
+  opacity: 0;
+}
+
 .edit-container-panel [type="radio"]:checked + label {
   outline: 2px solid grey;
   -moz-outline-radius: 50px;
diff --git a/webextension/img/usercontext.svg b/webextension/img/usercontext.svg
index 3237e98..f58067a 100644
--- a/webextension/img/usercontext.svg
+++ b/webextension/img/usercontext.svg
@@ -50,5 +50,23 @@
   <path id="food" d="M14.1,0.9v5.3h-1.4V0.9c0-1.1-1.4-1.1-1.4,0v5.3h-1.2V0.9c0-1.1-1.4-1.1-1.4,0v5.3H7.2V0.9c0-1.2-1.6-1.1-1.6,0
   v10.4c0,1.8,1.2,3,2.8,3v15.2c0,1.6,1.1,2.5,2.1,2.5s2.1-0.9,2.1-2.5V14.3c1.6,0,2.8-1.4,2.8-2.8V0.9C15.6-0.4,14.1-0.2,14.1,0.9z
    M19.8,3.7v25.8c0,3.2,4.2,3.2,4.2,0V17.1h2.3V3.7C26.5-1.2,19.8-1.2,19.8,3.7z"/>
+  <path id="fruit" d="M16.5,8c-2.1-0.9-3.9-1.2-6.6-0.9C4.6,8,1.8,12.6,1.8,18c0,5.9,4.8,14,9.8,14c1.6,0,3.9-1.2,4.4-1.2
+  c0.5,0,2.8,1.2,4.4,1.2c5,0,9.8-8.4,9.8-14c0-5.9-3.2-10.8-9.8-10.8C19,7.1,17.8,7.5,16.5,8z M11.7,0c1.1,0.2,3.2,0.9,4.1,2.3
+  c0.9,1.4,0.5,3.6,0.2,4.6c-1.2-0.2-3.2-0.7-4.1-2.3C11,3.2,11.4,1.1,11.7,0L11.7,0z"/>
+  <path id="pet" d="M28.5,8.1c0-1.1-1-1.9-2.1-2.4V3.7c-0.2-0.2-0.3-0.3-0.6-0.3c-0.6,0-1.1,0.8-1.3,2.1c-0.2,0-0.3,0-0.5,0l0,0
+  c0-0.2,0-0.3-0.2-0.5c-0.3-1.1-0.8-1.9-1.3-2.6C22,2.6,21.7,3.2,21.7,4L22,6.3c-0.3,0.2-0.6,0.3-1,0.6l-3.5,3.7l0,0
+  c0,0-6.3-0.8-10.9,0.2c-0.6,0-1,0.2-1.1,0.3c-0.5,0.2-0.8,0.3-1.1,0.6c-1.1-0.8-2.2-2.1-3.2-4c0-0.3-0.5-0.5-0.8-0.5s-0.5,0.6-0.3,1
+  c0.8,2.1,2.1,3.5,3.4,4.5c-0.5,0.5-0.8,1-1,1.6c0,0-0.3,2.2-0.3,5.5l1.4,8c0,1,0.8,1.8,1.9,1.8c1,0,1.9-0.8,1.9-1.8V23l0.5-1.3h8.8
+  l0.8,1.3v4.7c0,1,0.8,1.8,1.9,1.8c1,0,1.6-0.6,1.8-1.4l0,0l1.9-9l0,0l2.1-6.4h3c3.4,0,3.7-2.9,3.7-2.9L28.5,8.1z"/>
+  <path id="tree" d="M0.7,18c0,4.9,3.6,8.8,8.1,9.5v4.3c0.2,0,3.2,0,3.2,0v-4.3c1.8-0.4,3.6-1.1,4.9-2.5c0.2-0.2,0.2-0.2,0.2-0.5
+  c-0.2-0.4-0.2-1.1-0.2-1.6c0-2,0.2-4.9,1.6-7.9c0,0,0.9-1.6,0.7-1.8C18,7.2,14.4,0,10.4,0C5,0,0.7,12.6,0.7,18z M18.3,22.8
+  c0,3.1,2.2,5.6,4.9,6.3V32h3.2v-2.9c2.7-0.7,4.9-3.2,4.9-6.3c0-3.6-2.9-12.9-6.5-12.9S18.3,19.2,18.3,22.8z"/>
+  <path id="chill" d="M9.1,18.5l-5.7,5.9C3.2,23.8,3,23.3,3,22.6c0-2.5,2-4.4,4.4-4.4C7.8,18.1,8.5,18.3,9.1,18.5 M26.5,18.5l-5.7,5.9
+  c-0.2-0.5-0.4-1.1-0.4-1.8c0-2.5,2-4.4,4.4-4.4C25.4,18.1,26,18.3,26.5,18.5 M24.7,2L24.7,2c-0.7,0-1.4,0.7-1.4,1.4s0.7,1.4,1.4,1.4
+  c2.5,0,4.4,2,4.4,4.4v7.6c-1.6-1.2-3.6-1.8-5.5-1.4c-2.1,0.4-3.9,1.6-5,3.4c-1.6-1.2-3.9-1.2-5.5,0c-1.1-1.8-2.8-3-5-3.4
+  c-2-0.4-3.9,0.2-5.5,1.4V9.2c0-2.5,2-4.4,4.4-4.4c0.5,0,0.9-0.4,1.2-0.7c0.2-0.4,0.2-0.9,0-1.4C8.2,2.3,7.6,2,7.1,2
+  C3.2,2,0,5.2,0,9.2v13.5C0,26.7,3.2,30,7.1,30l0,0c3.9,0,7.1-3.2,7.1-7.3c0-0.2,0-0.4,0-0.5c0.2-0.9,0.9-1.4,1.8-1.4
+  s1.6,0.5,1.8,1.4v0.2c0,0.2,0,0.2,0,0.4c0,2,0.7,3.7,2.1,5c1.4,1.4,3,2.1,5,2.1l0,0c2,0,3.6-0.7,5-2.1c1.4-1.2,2.1-3.2,2.1-5V9.2
+  C32,5.2,28.8,2,24.7,2"/>
   <circle id="circle" r="16" cx="16" cy="16" fill-rule="evenodd"/>
 </svg>
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 5264f71..b8f982c 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -494,7 +494,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
       return `<input type="radio" value="${containerIcon}" name="container-icon" id="edit-container-panel-choose-icon-${containerIcon}" />
      <label for="edit-container-panel-choose-icon-${containerIcon}" class="usercontext-icon choose-color-icon" data-identity-color="grey" data-identity-icon="${containerIcon}">`;
     };
-    const icons = ["fingerprint", "briefcase", "dollar", "cart", "vacation", "gift", "food", "circle"];
+    const icons = ["fingerprint", "briefcase", "dollar", "cart", "vacation", "gift", "food", "fruit", "pet", "tree", "chill", "circle"];
     const iconRadioFieldset = document.getElementById("edit-container-panel-choose-icon");
     icons.forEach((containerIcon) => {
       const templateInstance = document.createElement("span");
diff --git a/webextension/manifest.json b/webextension/manifest.json
index 095eec6..fd0546a 100644
--- a/webextension/manifest.json
+++ b/webextension/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Containers Experiment",
-  "version": "0.9.0",
+  "version": "0.9.2",
 
   "description": "Containers works by isolating cookie jars using separate origin-attributes defined visually by colored ‘Container Tabs’. This add-on is a modified version of the containers feature for Firefox Test Pilot.",
   "icons": {