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
deleted file mode 100644
index d6a13d1..0000000
--- a/src/img/multiaccountcontainer-16.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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>
-  <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/ui/icon-mac.svg b/src/img/ui/icon-mac.svg
new file mode 100644
index 0000000..fd3b46c
--- /dev/null
+++ b/src/img/ui/icon-mac.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.375 5.12493V6.375C11.375 6.54076 11.4408 6.69973 11.558 6.81694C11.6753 6.93415 11.8342 7 12 7C12.1658 7 12.3247 6.93415 12.4419 6.81694C12.5591 6.69973 12.625 6.54076 12.625 6.375V5.12493L13.125 4.62493L14.375 4.625C14.5408 4.625 14.6997 4.55915 14.8169 4.44194C14.9341 4.32473 15 4.16576 15 4C15 3.83424 14.9341 3.67527 14.8169 3.55806C14.6997 3.44085 14.5408 3.375 14.375 3.375L13.125 3.37493L12.625 2.87493V1.625C12.625 1.45924 12.5591 1.30027 12.4419 1.18306C12.3247 1.06585 12.1658 1 12 1C11.8342 1 11.6753 1.06585 11.558 1.18306C11.4408 1.30027 11.375 1.45924 11.375 1.625V2.87493L10.875 3.37493L9.625 3.375C9.45924 3.375 9.30027 3.44085 9.18306 3.55806C9.06585 3.67527 9 3.83424 9 4C9 4.16576 9.06585 4.32473 9.18306 4.44194C9.30027 4.55915 9.45924 4.625 9.625 4.625L10.762 4.62493L11.375 5.12493Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 1H5C5.53043 1 6.03914 1.21071 6.41421 1.58579C6.78929 1.96086 7 2.46957 7 3V5C7 5.53043 6.78929 6.03914 6.41421 6.41421C6.03914 6.78929 5.53043 7 5 7H3C2.46957 7 1.96086 6.78929 1.58579 6.41421C1.21071 6.03914 1 5.53043 1 5V3C1 2.46957 1.21071 1.96086 1.58579 1.58579C1.96086 1.21071 2.46957 1 3 1Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 9H5C5.53043 9 6.03914 9.21071 6.41421 9.58579C6.78929 9.96086 7 10.4696 7 11V13C7 13.5304 6.78929 14.0391 6.41421 14.4142C6.03914 14.7893 5.53043 15 5 15H3C2.46957 15 1.96086 14.7893 1.58579 14.4142C1.21071 14.0391 1 13.5304 1 13V11C1 10.4696 1.21071 9.96086 1.58579 9.58579C1.96086 9.21071 2.46957 9 3 9Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 9H13C13.5304 9 14.0391 9.21071 14.4142 9.58579C14.7893 9.96086 15 10.4696 15 11V13C15 13.5304 14.7893 14.0391 14.4142 14.4142C14.0391 14.7893 13.5304 15 13 15H11C10.4696 15 9.96086 14.7893 9.58579 14.4142C9.21071 14.0391 9 13.5304 9 13V11C9 10.4696 9.21071 9.96086 9.58579 9.58579C9.96086 9.21071 10.4696 9 11 9Z" />
+</svg>
diff --git a/src/img/ui/icon-openin.svg b/src/img/ui/icon-openin.svg
new file mode 100644
index 0000000..aa783c1
--- /dev/null
+++ b/src/img/ui/icon-openin.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 1H5C5.53043 1 6.03914 1.21071 6.41421 1.58579C6.78929 1.96086 7 2.46957 7 3V5C7 5.53043 6.78929 6.03914 6.41421 6.41421C6.03914 6.78929 5.53043 7 5 7H3C2.46957 7 1.96086 6.78929 1.58579 6.41421C1.21071 6.03914 1 5.53043 1 5V3C1 2.46957 1.21071 1.96086 1.58579 1.58579C1.96086 1.21071 2.46957 1 3 1Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 9H5C5.53043 9 6.03914 9.21071 6.41421 9.58579C6.78929 9.96086 7 10.4696 7 11V13C7 13.5304 6.78929 14.0391 6.41421 14.4142C6.03914 14.7893 5.53043 15 5 15H3C2.46957 15 1.96086 14.7893 1.58579 14.4142C1.21071 14.0391 1 13.5304 1 13V11C1 10.4696 1.21071 9.96086 1.58579 9.58579C1.96086 9.21071 2.46957 9 3 9Z" />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 9H13C13.5304 9 14.0391 9.21071 14.4142 9.58579C14.7893 9.96086 15 10.4696 15 11V13C15 13.5304 14.7893 14.0391 14.4142 14.4142C14.0391 14.7893 13.5304 15 13 15H11C10.4696 15 9.96086 14.7893 9.58579 14.4142C9.21071 14.0391 9 13.5304 9 13V11C9 10.4696 9.21071 9.96086 9.58579 9.58579C9.96086 9.21071 10.4696 9 11 9Z" />
+<path d="M10.7074 1C10.6084 0.999824 10.5115 1.02905 10.4291 1.08398C10.3468 1.13891 10.2825 1.21706 10.2446 1.30854C10.2067 1.40001 10.1968 1.50068 10.2162 1.59779C10.2355 1.6949 10.2833 1.78407 10.3534 1.854L11.8074 3.308L9.50003 5.615C9.38321 5.73264 9.31765 5.89171 9.31765 6.0575C9.31765 6.22329 9.38321 6.38236 9.50003 6.5C9.61806 6.6162 9.7771 6.68125 9.94274 6.68107C10.1084 6.68088 10.2673 6.61547 10.385 6.499L12.6924 4.192L12.9734 4.473L14.1464 5.646C14.2163 5.71605 14.3053 5.76379 14.4024 5.78319C14.4994 5.80259 14.6 5.79277 14.6914 5.75498C14.7828 5.71718 14.861 5.65311 14.916 5.57088C14.971 5.48864 15.0004 5.39194 15.0004 5.293V1.3L14.7004 1H10.7074Z" />
+</svg>
diff --git a/src/manifest.json b/src/manifest.json
index 7f4aefc..721bb2a 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/ui/icon-mac.svg",
+    "96": "img/ui/icon-mac.svg"
   },
   "homepage_url": "https://github.com/mozilla/multi-account-containers#readme",
   "permissions": [
@@ -113,20 +113,20 @@
   },
   "browser_action": {
     "browser_style": true,
-    "default_icon": "img/multiaccountcontainer-16.svg",
+    "default_icon": "img/ui/icon-mac.svg",
     "default_title": "Multi-Account Containers",
     "default_popup": "popup.html",
     "theme_icons": [
       {
-        "light": "img/multiaccountcontainer-16-dark.svg",
-        "dark": "img/multiaccountcontainer-16.svg",
+        "light": "img/ui/icon-mac.svg",
+        "dark": "img/ui/icon-mac.svg",
         "size": 32
       }
     ]
   },
   "page_action": {
     "browser_style": true,
-    "default_icon": "img/container-openin-16.svg",
+    "default_icon": "img/ui/icon-openin.svg",
     "default_title": "Always open this in a Container",
     "default_popup": "pageActionPopup.html",
     "pinned": false,