diff --git a/chrome/icons/account-private.svg b/chrome/icons/account-private.svg
new file mode 100644
index 0000000..4c3040e
--- /dev/null
+++ b/chrome/icons/account-private.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="a" x1="4.22" x2="11.78" y1="7.979" y2="7.979" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#b2b2b2" offset="0"/>
+      <stop stop-color="#b2b2b2" stop-opacity="0" offset="1"/>
+    </linearGradient>
+  </defs>
+  <path fill="#303030" d="M0 0h16v16H0z"/>
+  <g fill="url(#a)">
+    <circle cx="8" cy="5.767" r="2.433"/>
+    <path d="M5.244 8.867c-.613 0-1.024.46-1.024 1.107 0 1.949 1.996 2.651 3.78 2.651 1.784 0 3.78-.702 3.78-2.651 0-.648-.41-1.107-1.023-1.107z"/>
+  </g>
+</svg>
diff --git a/chrome/icons/account.svg b/chrome/icons/account.svg
new file mode 100644
index 0000000..1400006
--- /dev/null
+++ b/chrome/icons/account.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#fafafa" d="M0 0h16v16H0z"/>
+  <g fill="#8f8f8f">
+    <circle cx="8" cy="5.767" r="2.433"/>
+    <path d="M5.244 8.867c-.613 0-1.024.46-1.024 1.107 0 1.949 1.996 2.651 3.78 2.651 1.784 0 3.78-.702 3.78-2.651 0-.648-.41-1.107-1.023-1.107z"/>
+  </g>
+</svg>
diff --git a/chrome/icons/icons.css b/chrome/icons/icons.css
index 887460d..9b081d4 100644
--- a/chrome/icons/icons.css
+++ b/chrome/icons/icons.css
@@ -37,6 +37,14 @@ and 11 so applied to both) */
   fill: currentColor !important;
 }
 
+:root[fxastatus="not_configured"] #fxa-avatar-image {
+  list-style-image: url("account.svg") !important;
+}
+
+:root[privatebrowsingmode] #fxa-avatar-image {
+  list-style-image: url("account-private.svg") !important;
+}
+
 /* disable context menu icons on macOS */
 @media not (-moz-platform: macos) {
   #context-back {
diff --git a/chrome/toolbar/navbar.css b/chrome/toolbar/navbar.css
index 4190331..fec2e88 100644
--- a/chrome/toolbar/navbar.css
+++ b/chrome/toolbar/navbar.css
@@ -30,7 +30,8 @@
 
 /* account button */
 #navigator-toolbox>toolbar #fxa-toolbar-menu-button,
-#navigator-toolbox>toolbar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack {
+#navigator-toolbox>toolbar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack,
+#fxa-avatar-image {
   border-radius: 99px !important;
 }
 
@@ -39,7 +40,15 @@
   margin-inline: calc(var(--uc-toolbarbutton-inner-inline-padding) - var(--toolbarbutton-inner-padding)) !important;
 }
 
-:root[fxastatus="signedin"] #fxa-avatar-image {
+#fxa-toolbar-menu-button {
+  display: -moz-box !important;
+}
+
+#widget-overflow-list>#fxa-toolbar-menu-button #fxa-avatar-image {
+  scale: 1.25 !important;
+}
+
+#nav-bar-customization-target>#fxa-toolbar-menu-button #fxa-avatar-image {
   scale: 1.5 !important;
 }