diff --git a/web/CommIcon.react.js b/web/CommIcon.react.js
--- a/web/CommIcon.react.js
+++ b/web/CommIcon.react.js
@@ -18,7 +18,8 @@
   | 'emote-smile-filled'
   | 'pin'
   | 'unpin'
-  | 'pin-mirror';
+  | 'pin-mirror'
+  | 'edit-filled';
 
 type CommIconProps = {
   +icon: CommIcons,
diff --git a/web/utils/tooltip-action-utils.js b/web/utils/tooltip-action-utils.js
--- a/web/utils/tooltip-action-utils.js
+++ b/web/utils/tooltip-action-utils.js
@@ -5,7 +5,6 @@
 import * as React from 'react';
 
 import { useModalContext } from 'lib/components/modal-provider.react.js';
-import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
 import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors.js';
 import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
 import { createMessageReply } from 'lib/shared/message-utils.js';
@@ -241,9 +240,7 @@
     if (!canEditMessage) {
       return null;
     }
-    const buttonContent = (
-      <SWMansionIcon icon="edit-1" size={18} disableFill={false} />
-    );
+    const buttonContent = <CommIcon icon="edit-filled" size={18} />;
     const onClickEdit = () => {
       clearTooltip();
       renderEditModal({