diff --git a/src/core/client/stream/common/MessageBox/MessageBoxIcon.tsx b/src/core/client/stream/common/MessageBox/MessageBoxIcon.tsx
index 06df96d12f..72a5de7c10 100644
--- a/src/core/client/stream/common/MessageBox/MessageBoxIcon.tsx
+++ b/src/core/client/stream/common/MessageBox/MessageBoxIcon.tsx
@@ -14,7 +14,6 @@ import {
   QuestionHelpMessageIcon,
   SvgIcon,
 } from "coral-ui/components/icons";
-import { IconProps } from "coral-ui/components/v2/Icon";
 import { withForwardRef, withStyles } from "coral-ui/hocs";
 
 import styles from "./MessageBoxIcon.css";
@@ -24,9 +23,9 @@ interface Props extends Omit<HTMLAttributes<HTMLSpanElement>, "color"> {
    * This prop can be used to add custom classnames.
    * It is handled by the `withStyles `HOC.
    */
-  classes: typeof styles & IconProps["classes"];
+  classes: typeof styles;
 
-  size?: IconProps["size"];
+  size?: "xs" | "sm" | "md" | "lg" | "xl";
 
   /** The name of the icon to render */
   icon: string;
diff --git a/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx
index 4d1a504bcf..5c198844c9 100644
--- a/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx
+++ b/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx
@@ -19,7 +19,7 @@ import {
 import { useFetch, withFragmentContainer } from "coral-framework/lib/relay";
 import CLASSES from "coral-stream/classes";
 import WarningError from "coral-stream/common/WarningError";
-import { Icon } from "coral-ui/components/v2";
+import { ConversationChatTextIcon, SvgIcon } from "coral-ui/components/icons";
 import { Button, CallOut } from "coral-ui/components/v3";
 import { useShadowRootOrDocument } from "coral-ui/encapsulation";
 
@@ -280,7 +280,7 @@ const ReplyCommentFormContainer: FunctionComponent<Props> = ({
             Your reply has posted below
           </Localized>
         }
-        icon={<Icon>question_answer</Icon>}
+        icon={<SvgIcon Icon={ConversationChatTextIcon} />}
         iconColor="none"
         color="primary"
         aria-live="polite"
diff --git a/src/core/client/ui/components/v2/Message/MessageIcon.tsx b/src/core/client/ui/components/v2/Message/MessageIcon.tsx
index c8d54089a9..da5c632c3d 100644
--- a/src/core/client/ui/components/v2/Message/MessageIcon.tsx
+++ b/src/core/client/ui/components/v2/Message/MessageIcon.tsx
@@ -9,8 +9,6 @@ import React, {
 import { SvgIcon } from "coral-ui/components/icons";
 import { withForwardRef, withStyles } from "coral-ui/hocs";
 
-import { IconProps } from "../Icon";
-
 import styles from "./MessageIcon.css";
 
 interface Props extends Omit<HTMLAttributes<HTMLSpanElement>, "color"> {
@@ -18,9 +16,9 @@ interface Props extends Omit<HTMLAttributes<HTMLSpanElement>, "color"> {
    * This prop can be used to add custom classnames.
    * It is handled by the `withStyles `HOC.
    */
-  classes: typeof styles & IconProps["classes"];
+  classes: typeof styles;
 
-  size?: IconProps["size"];
+  size?: "xs" | "sm" | "md" | "lg" | "xl";
 
   Icon: ComponentType;