diff --git a/src/img/container-site-d-24.png b/src/img/container-site-d-24.png
deleted file mode 100644
index 3ef2901..0000000
Binary files a/src/img/container-site-d-24.png and /dev/null differ
diff --git a/src/img/container-site-d-48.png b/src/img/container-site-d-48.png
deleted file mode 100644
index beb0bfa..0000000
Binary files a/src/img/container-site-d-48.png and /dev/null differ
diff --git a/src/img/container-site-d-96.png b/src/img/container-site-d-96.png
deleted file mode 100644
index 3c3e032..0000000
Binary files a/src/img/container-site-d-96.png and /dev/null differ
diff --git a/src/img/multiaccountcontainer-16-dark.svg b/src/img/multiaccountcontainer-16-dark.svg
deleted file mode 100644
index 3c1e24c..0000000
--- a/src/img/multiaccountcontainer-16-dark.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. --><svg data-name="Flat (For Export)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <style>rect,path {fill: rgba(249, 249, 250, 0.8);}</style>
-  <rect x="1" y="1" width="6" height="6" rx="1"/>
-  <path d="M14.75 3H13V1.25A0.25 0.25 0 0 0 12.75 1h-1.5A0.25 0.25 0 0 0 11 1.25V3H9.25A0.25 0.25 0 0 0 9 3.25v1.5A0.25 0.25 0 0 0 9.25 5H11v1.75A0.25 0.25 0 0 0 11.25 7h1.5A0.25 0.25 0 0 0 13 6.75V5h1.75A0.25 0.25 0 0 0 15 4.75v-1.5A0.25 0.25 0 0 0 14.75 3z" fill-rule="evenodd"/>
-  <rect x="1" y="9" width="6" height="6" rx="1"/>
-  <rect x="9" y="9" width="6" height="6" rx="1"/>
-</svg>
\ No newline at end of file
diff --git a/src/img/multiaccountcontainer-16.svg b/src/img/multiaccountcontainer-16.svg
index d6a13d1..bb68c83 100644
--- a/src/img/multiaccountcontainer-16.svg
+++ b/src/img/multiaccountcontainer-16.svg
@@ -1,7 +1,13 @@
 <svg data-name="Flat (For Export)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <style>rect,path {fill: rgba(24, 25, 26, 01);}</style>
+  <style>
+    :root { color-scheme: light dark; }
+    rect, path { fill: rgb(24, 25, 26); }
+    @media (prefers-color-scheme: dark) {
+      rect, path { fill: rgba(249, 249, 250, 0.8); }
+    }
+  </style>
   <rect x="1" y="1" width="6" height="6" rx="1"/>
   <path d="M14.75 3H13V1.25A0.25 0.25 0 0 0 12.75 1h-1.5A0.25 0.25 0 0 0 11 1.25V3H9.25A0.25 0.25 0 0 0 9 3.25v1.5A0.25 0.25 0 0 0 9.25 5H11v1.75A0.25 0.25 0 0 0 11.25 7h1.5A0.25 0.25 0 0 0 13 6.75V5h1.75A0.25 0.25 0 0 0 15 4.75v-1.5A0.25 0.25 0 0 0 14.75 3z" fill-rule="evenodd"/>
   <rect x="1" y="9" width="6" height="6" rx="1"/>
   <rect x="9" y="9" width="6" height="6" rx="1"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/img/usercontext.svg b/src/img/usercontext.svg
index fb48e4a..2b1cb23 100644
--- a/src/img/usercontext.svg
+++ b/src/img/usercontext.svg
@@ -4,6 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;">
   <style>
+    :root { color-scheme: light dark; }
     path, circle, g {
       fill: menutext;
     }
diff --git a/src/js/content-script.js b/src/js/content-script.js
index 539e43a..fba6e09 100644
--- a/src/js/content-script.js
+++ b/src/js/content-script.js
@@ -24,11 +24,12 @@ async function addMessage(message) {
   divElement.innerText = message.text;
 
   const imageElement = document.createElement("img");
-  const imagePath = browser.runtime.getURL("/img/container-site-d-24.png");
+  const imagePath = browser.runtime.getURL("/img/multiaccountcontainer-16.svg");
   const response = await fetch(imagePath);
   const blob = await response.blob();
   const objectUrl = URL.createObjectURL(blob);
   imageElement.src = objectUrl;
+  imageElement.width = imageElement.height = 24;
   divElement.prepend(imageElement);
 
   document.body.appendChild(divElement);
diff --git a/src/manifest.json b/src/manifest.json
index 1ce9a41..6ec32f3 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -5,8 +5,8 @@
   "incognito": "not_allowed",
   "description": "__MSG_extensionDescription__",
   "icons": {
-    "48": "img/container-site-d-48.png",
-    "96": "img/container-site-d-96.png"
+    "48": "img/multiaccountcontainer-16.svg",
+    "96": "img/multiaccountcontainer-16.svg"
   },
   "homepage_url": "https://github.com/mozilla/multi-account-containers#readme",
   "permissions": [
@@ -118,7 +118,7 @@
     "default_popup": "popup.html",
     "theme_icons": [
       {
-        "light": "img/multiaccountcontainer-16-dark.svg",
+        "light": "img/multiaccountcontainer-16.svg",
         "dark": "img/multiaccountcontainer-16.svg",
         "size": 32
       }
@@ -151,7 +151,7 @@
   ],
   "default_locale": "en",
   "web_accessible_resources": [
-    "/img/container-site-d-24.png"
+    "/img/multiaccountcontainer-16.svg"
   ],
   "options_ui": {
     "page": "options.html",