diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 36095b450bfe..8c73544becaf 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -137,18 +137,6 @@ browser.jar:
         content/browser/tabbrowser.xml                (content/tabbrowser.xml)
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
         content/browser/utilityOverlay.js             (content/utilityOverlay.js)
-        content/browser/usercontext-briefcase.svg     (content/usercontext-briefcase.svg)
-        content/browser/usercontext-cart.svg          (content/usercontext-cart.svg)
-        content/browser/usercontext-circle.svg        (content/usercontext-circle.svg)
-        content/browser/usercontext-dollar.svg        (content/usercontext-dollar.svg)
-        content/browser/usercontext-fingerprint.svg   (content/usercontext-fingerprint.svg)
-        content/browser/usercontext-gift.svg          (content/usercontext-gift.svg)
-        content/browser/usercontext-vacation.svg      (content/usercontext-vacation.svg)
-        content/browser/usercontext-food.svg          (content/usercontext-food.svg)
-        content/browser/usercontext-fruit.svg         (content/usercontext-fruit.svg)
-        content/browser/usercontext-pet.svg           (content/usercontext-pet.svg)
-        content/browser/usercontext-tree.svg          (content/usercontext-tree.svg)
-        content/browser/usercontext-chill.svg         (content/usercontext-chill.svg)
         content/browser/web-panels.js                 (content/web-panels.js)
 *       content/browser/web-panels.xul                (content/web-panels.xul)
         content/browser/webext-panels.js              (content/webext-panels.js)
diff --git a/browser/base/content/usercontext-briefcase.svg b/browser/components/contextualidentity/content/briefcase.svg
similarity index 100%
rename from browser/base/content/usercontext-briefcase.svg
rename to browser/components/contextualidentity/content/briefcase.svg
diff --git a/browser/base/content/usercontext-cart.svg b/browser/components/contextualidentity/content/cart.svg
similarity index 100%
rename from browser/base/content/usercontext-cart.svg
rename to browser/components/contextualidentity/content/cart.svg
diff --git a/browser/base/content/usercontext-chill.svg b/browser/components/contextualidentity/content/chill.svg
similarity index 100%
rename from browser/base/content/usercontext-chill.svg
rename to browser/components/contextualidentity/content/chill.svg
diff --git a/browser/base/content/usercontext-circle.svg b/browser/components/contextualidentity/content/circle.svg
similarity index 100%
rename from browser/base/content/usercontext-circle.svg
rename to browser/components/contextualidentity/content/circle.svg
diff --git a/browser/base/content/usercontext-dollar.svg b/browser/components/contextualidentity/content/dollar.svg
similarity index 100%
rename from browser/base/content/usercontext-dollar.svg
rename to browser/components/contextualidentity/content/dollar.svg
diff --git a/browser/base/content/usercontext-fingerprint.svg b/browser/components/contextualidentity/content/fingerprint.svg
similarity index 100%
rename from browser/base/content/usercontext-fingerprint.svg
rename to browser/components/contextualidentity/content/fingerprint.svg
diff --git a/browser/base/content/usercontext-food.svg b/browser/components/contextualidentity/content/food.svg
similarity index 100%
rename from browser/base/content/usercontext-food.svg
rename to browser/components/contextualidentity/content/food.svg
diff --git a/browser/base/content/usercontext-fruit.svg b/browser/components/contextualidentity/content/fruit.svg
similarity index 100%
rename from browser/base/content/usercontext-fruit.svg
rename to browser/components/contextualidentity/content/fruit.svg
diff --git a/browser/base/content/usercontext-gift.svg b/browser/components/contextualidentity/content/gift.svg
similarity index 100%
rename from browser/base/content/usercontext-gift.svg
rename to browser/components/contextualidentity/content/gift.svg
diff --git a/browser/base/content/usercontext-pet.svg b/browser/components/contextualidentity/content/pet.svg
similarity index 100%
rename from browser/base/content/usercontext-pet.svg
rename to browser/components/contextualidentity/content/pet.svg
diff --git a/browser/base/content/usercontext-tree.svg b/browser/components/contextualidentity/content/tree.svg
similarity index 100%
rename from browser/base/content/usercontext-tree.svg
rename to browser/components/contextualidentity/content/tree.svg
diff --git a/browser/components/contextualidentity/content/usercontext.css b/browser/components/contextualidentity/content/usercontext.css
index d5f846dfe44c..b59d945a4dd3 100644
--- a/browser/components/contextualidentity/content/usercontext.css
+++ b/browser/components/contextualidentity/content/usercontext.css
@@ -39,51 +39,51 @@
 }
 
 [data-identity-icon="fingerprint"] {
-  --identity-icon: url("chrome://browser/content/usercontext-fingerprint.svg");
+  --identity-icon: url("resource://usercontext-content/fingerprint.svg");
 }
 
 [data-identity-icon="briefcase"] {
-  --identity-icon: url("chrome://browser/content/usercontext-briefcase.svg");
+  --identity-icon: url("resource://usercontext-content/briefcase.svg");
 }
 
 [data-identity-icon="dollar"] {
-  --identity-icon: url("chrome://browser/content/usercontext-dollar.svg");
+  --identity-icon: url("resource://usercontext-content/dollar.svg");
 }
 
 [data-identity-icon="cart"] {
-  --identity-icon: url("chrome://browser/content/usercontext-cart.svg");
+  --identity-icon: url("resource://usercontext-content/cart.svg");
 }
 
 [data-identity-icon="circle"] {
-  --identity-icon: url("chrome://browser/content/usercontext-circle.svg");
+  --identity-icon: url("resource://usercontext-content/circle.svg");
 }
 
 [data-identity-icon="vacation"] {
-  --identity-icon: url("chrome://browser/content/usercontext-vacation.svg");
+  --identity-icon: url("resource://usercontext-content/vacation.svg");
 }
 
 [data-identity-icon="gift"] {
-  --identity-icon: url("chrome://browser/content/usercontext-gift.svg");
+  --identity-icon: url("resource://usercontext-content/gift.svg");
 }
 
 [data-identity-icon="food"] {
-  --identity-icon: url("chrome://browser/content/usercontext-food.svg");
+  --identity-icon: url("resource://usercontext-content/food.svg");
 }
 
 [data-identity-icon="fruit"] {
-  --identity-icon: url("chrome://browser/content/usercontext-fruit.svg");
+  --identity-icon: url("resource://usercontext-content/fruit.svg");
 }
 
 [data-identity-icon="pet"] {
-  --identity-icon: url("chrome://browser/content/usercontext-pet.svg");
+  --identity-icon: url("resource://usercontext-content/pet.svg");
 }
 
 [data-identity-icon="tree"] {
-  --identity-icon: url("chrome://browser/content/usercontext-tree.svg");
+  --identity-icon: url("resource://usercontext-content/tree.svg");
 }
 
 [data-identity-icon="chill"] {
-  --identity-icon: url("chrome://browser/content/usercontext-chill.svg");
+  --identity-icon: url("resource://usercontext-content/chill.svg");
 }
 
 #userContext-indicator {
diff --git a/browser/base/content/usercontext-vacation.svg b/browser/components/contextualidentity/content/vacation.svg
similarity index 100%
rename from browser/base/content/usercontext-vacation.svg
rename to browser/components/contextualidentity/content/vacation.svg
diff --git a/browser/components/contextualidentity/jar.mn b/browser/components/contextualidentity/jar.mn
index 848245949a67..c46283dfc32b 100644
--- a/browser/components/contextualidentity/jar.mn
+++ b/browser/components/contextualidentity/jar.mn
@@ -4,3 +4,17 @@
 
 browser.jar:
     content/browser/usercontext/usercontext.css (content/usercontext.css)
+
+% resource usercontext-content %content/ contentaccessible=yes
+    content/briefcase.svg     (content/briefcase.svg)
+    content/cart.svg          (content/cart.svg)
+    content/circle.svg        (content/circle.svg)
+    content/dollar.svg        (content/dollar.svg)
+    content/fingerprint.svg   (content/fingerprint.svg)
+    content/gift.svg          (content/gift.svg)
+    content/vacation.svg      (content/vacation.svg)
+    content/food.svg          (content/food.svg)
+    content/fruit.svg         (content/fruit.svg)
+    content/pet.svg           (content/pet.svg)
+    content/tree.svg          (content/tree.svg)
+    content/chill.svg         (content/chill.svg)