diff --git a/styles/src/styleTree/contactList.ts b/styles/src/styleTree/contactList.ts
index f2430d31e6..8b8b6024cf 100644
--- a/styles/src/styleTree/contactList.ts
+++ b/styles/src/styleTree/contactList.ts
@@ -90,13 +90,13 @@ export default function contactList(theme: Theme) {
       cornerRadius: 4,
       padding: 4,
       margin: { top: 12, left: 12 },
-      background: iconColor(theme, "success"),
+      background: iconColor(theme, "ok"),
     },
     contactStatusBusy: {
       cornerRadius: 4,
       padding: 4,
       margin: { top: 12, left: 12 },
-      background: iconColor(theme, "warning"),
+      background: iconColor(theme, "error"),
     },
     contactUsername: {
       ...text(theme, "mono", "primary", { size: "sm" }),
diff --git a/styles/src/styleTree/contactsPopover.ts b/styles/src/styleTree/contactsPopover.ts
index 57af5a6d4d..7d699fa26b 100644
--- a/styles/src/styleTree/contactsPopover.ts
+++ b/styles/src/styleTree/contactsPopover.ts
@@ -1,18 +1,7 @@
 import Theme from "../themes/common/theme";
-import { backgroundColor, border, borderColor, iconColor, player, popoverShadow, text } from "./components";
+import { backgroundColor, border, popoverShadow } from "./components";
 
 export default function contactsPopover(theme: Theme) {
-  const nameMargin = 8;
-  const sidePadding = 12;
-
-  const contactButton = {
-    background: backgroundColor(theme, 100),
-    color: iconColor(theme, "primary"),
-    iconWidth: 8,
-    buttonWidth: 16,
-    cornerRadius: 8,
-  };
-
   return {
     background: backgroundColor(theme, 300, "base"),
     cornerRadius: 6,
@@ -21,107 +10,5 @@ export default function contactsPopover(theme: Theme) {
     border: border(theme, "primary"),
     width: 250,
     height: 300,
-    userQueryEditor: {
-      background: backgroundColor(theme, 500),
-      cornerRadius: 6,
-      text: text(theme, "mono", "primary"),
-      placeholderText: text(theme, "mono", "placeholder", { size: "sm" }),
-      selection: player(theme, 1).selection,
-      border: border(theme, "secondary"),
-      padding: {
-        bottom: 4,
-        left: 8,
-        right: 8,
-        top: 4,
-      },
-      margin: {
-        left: sidePadding,
-        right: sidePadding,
-      },
-    },
-    userQueryEditorHeight: 32,
-    addContactButton: {
-      margin: { left: 6, right: 12 },
-      color: iconColor(theme, "primary"),
-      buttonWidth: 16,
-      iconWidth: 16,
-    },
-    privateButton: {
-      iconWidth: 12,
-      color: iconColor(theme, "primary"),
-      cornerRadius: 5,
-      buttonWidth: 12,
-    },
-    rowHeight: 28,
-    sectionIconSize: 8,
-    headerRow: {
-      ...text(theme, "mono", "secondary", { size: "sm" }),
-      margin: { top: 14 },
-      padding: {
-        left: sidePadding,
-        right: sidePadding,
-      },
-      active: {
-        ...text(theme, "mono", "primary", { size: "sm" }),
-        background: backgroundColor(theme, 100, "active"),
-      },
-    },
-    contactRow: {
-      padding: {
-        left: sidePadding,
-        right: sidePadding,
-      },
-      active: {
-        background: backgroundColor(theme, 100, "active"),
-      },
-    },
-    contactAvatar: {
-      cornerRadius: 10,
-      width: 18,
-    },
-    contactStatusFree: {
-      cornerRadius: 4,
-      padding: 4,
-      margin: { top: 12, left: 12 },
-      background: iconColor(theme, "success"),
-    },
-    contactStatusBusy: {
-      cornerRadius: 4,
-      padding: 4,
-      margin: { top: 12, left: 12 },
-      background: iconColor(theme, "warning"),
-    },
-    contactUsername: {
-      ...text(theme, "mono", "primary", { size: "sm" }),
-      margin: {
-        left: nameMargin,
-      },
-    },
-    contactButtonSpacing: nameMargin,
-    contactButton: {
-      ...contactButton,
-      hover: {
-        background: backgroundColor(theme, "on300", "hovered"),
-      },
-    },
-    disabledButton: {
-      ...contactButton,
-      background: backgroundColor(theme, 100),
-      color: iconColor(theme, "muted"),
-    },
-    inviteRow: {
-      padding: {
-        left: sidePadding,
-        right: sidePadding,
-      },
-      border: { top: true, width: 1, color: borderColor(theme, "primary") },
-      text: text(theme, "sans", "secondary", { size: "sm" }),
-      hover: {
-        text: text(theme, "sans", "active", { size: "sm" }),
-      },
-    },
-    callingIndicator: {
-      ...text(theme, "mono", "muted", { size: "xs" })
-    }
   }
 }
diff --git a/styles/src/themes/common/base16.ts b/styles/src/themes/common/base16.ts
index 3612988075..7aa72ef137 100644
--- a/styles/src/themes/common/base16.ts
+++ b/styles/src/themes/common/base16.ts
@@ -137,7 +137,6 @@ export function createTheme(
     ok: sample(ramps.green, 0.5),
     error: sample(ramps.red, 0.5),
     warning: sample(ramps.yellow, 0.5),
-    success: sample(ramps.green, 0.5),
     info: sample(ramps.blue, 0.5),
     onMedia: darkest,
   };
diff --git a/styles/src/themes/common/theme.ts b/styles/src/themes/common/theme.ts
index 18ad8122e0..e01435b846 100644
--- a/styles/src/themes/common/theme.ts
+++ b/styles/src/themes/common/theme.ts
@@ -123,7 +123,6 @@ export default interface Theme {
     error: string;
     warning: string;
     info: string;
-    success: string;
   };
   editor: {
     background: string;