diff --git a/lib/shared/comm-icon-config.json b/lib/shared/comm-icon-config.json
--- a/lib/shared/comm-icon-config.json
+++ b/lib/shared/comm-icon-config.json
@@ -4,14 +4,37 @@
     {
       "icon": {
         "paths": [
-          "M658.286 0c-201.947 0-365.714 163.767-365.714 365.714v73.143c-161.573 0-292.571 130.999-292.571 292.571s130.999 292.571 292.571 292.571h731.429c161.573 0 292.571-130.999 292.571-292.571s-130.999-292.571-292.571-292.571v-73.143c0-201.947-163.767-365.714-365.714-365.714z"
+          "M512 85.333c235.643 0 426.667 191.025 426.667 426.667s-191.024 426.667-426.667 426.667c-235.642 0-426.667-191.024-426.667-426.667s191.025-426.667 426.667-426.667zM317.265 573.265c-13.183 9.886-16.81 27.786-9.189 41.855l2.625 4.094 0.445 0.586 0.842 1.077c0.693 0.875 1.649 2.057 2.863 3.505 2.427 2.893 5.899 6.853 10.376 11.522 8.926 9.317 22.003 21.618 38.922 33.923 33.71 24.515 84.107 50.036 147.851 50.036 63.742 0 114.141-25.521 147.85-50.036 16.918-12.306 29.998-24.607 38.925-33.923 4.477-4.669 7.947-8.63 10.371-11.522 1.217-1.448 2.171-2.63 2.866-3.505l0.84-1.077 0.271-0.359c-0.201-0.457-0.433-0.634-0.819-0.928l-0.71-0.572 1.704 1.272c10.875-14.502 7.938-35.074-6.564-45.949-13.176-9.882-31.364-8.357-42.739 2.884l-3.161 3.614-0.289 0.368c-0.324 0.407-0.884 1.107-1.676 2.052-1.593 1.895-4.1 4.77-7.487 8.306-6.8 7.094-16.97 16.673-30.138 26.248-26.462 19.246-63.584 37.485-109.244 37.485-45.658 0-82.782-18.239-109.243-37.485-13.167-9.575-23.338-19.154-30.138-26.248-3.387-3.536-5.898-6.411-7.488-8.306-0.794-0.945-1.355-1.645-1.677-2.052-11.141-14.809-31.697-17.736-46.189-6.866zM653.411 347.897h-0.565c-23.407 0-42.384 18.976-42.384 42.384s18.977 42.384 42.384 42.384h0.565c23.407 0 42.384-18.976 42.384-42.384s-18.977-42.384-42.384-42.384zM371.483 347.897h-0.565c-23.408 0-42.384 18.976-42.384 42.384s18.976 42.384 42.384 42.384h0.565c23.408 0 42.384-18.976 42.384-42.384s-18.976-42.384-42.384-42.384z"
         ],
         "attrs": [{}],
-        "width": 1317,
         "isMulticolor": false,
         "isMulticolor2": false,
         "grid": 0,
-        "tags": ["cloud-filled"]
+        "tags": ["emote-smile-filled"]
+      },
+      "attrs": [{}],
+      "properties": {
+        "order": 3,
+        "id": 7,
+        "name": "emote-smile-filled",
+        "prevSize": 32,
+        "code": 59654
+      },
+      "setIdx": 1,
+      "setId": 2,
+      "iconIdx": 0
+    },
+    {
+      "icon": {
+        "paths": [
+          "M658.286 0c-201.947 0-365.714 163.767-365.714 365.714v73.143c-161.573 0-292.571 130.999-292.571 292.571s130.999 292.571 292.571 292.571h731.429c161.573 0 292.571-130.999 292.571-292.571s-130.999-292.571-292.571-292.571v-73.143c0-201.947-163.767-365.714-365.714-365.714z"
+        ],
+        "width": 1317,
+        "attrs": [{}],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": ["cloud-filled"],
+        "grid": 0
       },
       "attrs": [{}],
       "properties": {
@@ -22,8 +45,8 @@
         "code": 59648
       },
       "setIdx": 1,
-      "setId": 10,
-      "iconIdx": 0
+      "setId": 2,
+      "iconIdx": 1
     },
     {
       "icon": {
@@ -32,12 +55,12 @@
           "M432.547 692.53l-40.308 131.593c-8.427 27.442 6.22 56.736 33.257 66.47l310.226 112.604c30.575 10.982 63.84-7.063 70.962-38.789l43.017-187.193c6.901-29.975-12.695-59.706-43.014-65.12l-312.862-56.757c-26.906-4.991-53.277 11.028-61.278 37.193zM502.838 739.059l261.767 47.535-29.912 130.21-257.725-93.507 25.869-84.237z",
           "M1065.206 16.225l-700.699 170.863c-24.102 5.81-41.139 27.454-41.139 52.367v406.797c0 25.494 17.848 47.549 42.903 52.733l700.386 149.452c33.538 7.14 65.133-18.473 65.133-52.735v-727.094c0-34.912-32.694-60.586-66.583-52.383zM1050.947 102.885v659.51l-646.737-137.971v-363.843l646.737-157.696z"
         ],
-        "attrs": [{}, {}, {}],
         "width": 1132,
+        "attrs": [{}, {}, {}],
         "isMulticolor": false,
         "isMulticolor2": false,
-        "grid": 0,
-        "tags": ["megaphone"]
+        "tags": ["megaphone"],
+        "grid": 0
       },
       "attrs": [{}, {}, {}],
       "properties": {
@@ -48,20 +71,20 @@
         "code": 59649
       },
       "setIdx": 1,
-      "setId": 10,
-      "iconIdx": 1
+      "setId": 2,
+      "iconIdx": 2
     },
     {
       "icon": {
         "paths": [
           "M34.752 441.984c-31.040 25.6-31.040 73.152 0 98.752l507.456 418.56c41.728 34.368 104.704 4.736 104.704-49.408v-255.808c239.232 11.456 449.728 90.496 586.752 207.936 30.016 25.792 78.592 12.864 78.592-26.752 0-273.152-290.176-498.624-665.344-531.904v-230.464c0-54.144-62.976-83.84-104.704-49.408l-507.456 418.496z"
         ],
-        "attrs": [{}],
         "width": 1344,
+        "attrs": [{}],
         "isMulticolor": false,
         "isMulticolor2": false,
-        "grid": 0,
-        "tags": ["reply-filled"]
+        "tags": ["reply-filled"],
+        "grid": 0
       },
       "attrs": [{}],
       "properties": {
@@ -72,20 +95,20 @@
         "code": 59650
       },
       "setIdx": 1,
-      "setId": 10,
-      "iconIdx": 2
+      "setId": 2,
+      "iconIdx": 3
     },
     {
       "icon": {
         "paths": [
           "M541.796 47.496l-477.596 393.871c-51.125 42.165-51.125 120.485-0.001 162.649l484.365 399.092c68.601 48.299 165.707-0.256 165.707-86.508l-0.045-192.392 2.853 0.288c190.546 17.759 360.768 83.569 474.854 181.349 55.99 48.111 148.545 19.231 148.545-59.48l-0.258-14.54c-9.266-260.857-267.192-474.604-609.354-524.327l-16.639-2.287 0.045-176.369c0-89.143-103.724-138.076-172.474-81.347zM623.917 128.843v258.254l41.185 3.653 18.536 1.824c319.722 34.592 557.376 222.822 566.23 441.162l0.030 2.811 0.876 0.732c-140.156-120.125-349.725-195.561-579.519-206.565l-47.337-2.267v288.152c0 12.742-14.817 19.726-24.648 11.63l-477.581-393.918c-7.306-6.026-7.306-17.215-0.002-23.24l477.614-393.886c9.807-8.092 24.616-1.106 24.616 11.656z"
         ],
-        "attrs": [{}],
         "width": 1385,
+        "attrs": [{}],
         "isMulticolor": false,
         "isMulticolor2": false,
-        "grid": 0,
-        "tags": ["reply"]
+        "tags": ["reply"],
+        "grid": 0
       },
       "attrs": [{}],
       "properties": {
@@ -96,8 +119,8 @@
         "code": 59651
       },
       "setIdx": 1,
-      "setId": 10,
-      "iconIdx": 3
+      "setId": 2,
+      "iconIdx": 4
     },
     {
       "icon": {
@@ -107,8 +130,8 @@
         "attrs": [{}],
         "isMulticolor": false,
         "isMulticolor2": false,
-        "grid": 0,
-        "tags": ["sidebar-filled"]
+        "tags": ["sidebar-filled"],
+        "grid": 0
       },
       "attrs": [{}],
       "properties": {
@@ -119,8 +142,8 @@
         "code": 59652
       },
       "setIdx": 1,
-      "setId": 10,
-      "iconIdx": 4
+      "setId": 2,
+      "iconIdx": 5
     },
     {
       "icon": {
@@ -132,8 +155,8 @@
         "attrs": [{}, {}, {}],
         "isMulticolor": false,
         "isMulticolor2": false,
-        "grid": 0,
-        "tags": ["sidebar"]
+        "tags": ["sidebar"],
+        "grid": 0
       },
       "attrs": [{}, {}, {}],
       "properties": {
@@ -144,8 +167,8 @@
         "code": 59653
       },
       "setIdx": 1,
-      "setId": 10,
-      "iconIdx": 5
+      "setId": 2,
+      "iconIdx": 6
     },
     {
       "icon": {
@@ -158,20 +181,21 @@
         "attrs": [],
         "isMulticolor": false,
         "isMulticolor2": false,
-        "grid": 0,
+        "colorPermutations": {},
         "tags": ["copy-filled"],
-        "colorPermutations": {}
+        "grid": 0
       },
       "attrs": [],
       "properties": {
         "order": 376,
-        "id": 7,
+        "id": 6,
         "name": "copy-filled",
-        "prevSize": 32
+        "prevSize": 32,
+        "code": 59655
       },
       "setIdx": 1,
-      "setId": 10,
-      "iconIdx": 6
+      "setId": 2,
+      "iconIdx": 7
     }
   ],
   "height": 1024,
@@ -194,7 +218,8 @@
       "showMetrics": true,
       "showMetadata": true,
       "noie8": false,
-      "ie7": false
+      "ie7": false,
+      "showVersion": true
     },
     "imagePref": {
       "prefix": "icon-",
diff --git a/native/fonts/CommIcons.ttf b/native/fonts/CommIcons.ttf
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/web/CommIcon.react.js b/web/CommIcon.react.js
--- a/web/CommIcon.react.js
+++ b/web/CommIcon.react.js
@@ -12,7 +12,8 @@
   | 'reply'
   | 'reply-filled'
   | 'megaphone'
-  | 'copy-filled';
+  | 'copy-filled'
+  | 'emote-smile-filled';
 
 type CommIconProps = {
   +icon: CommIcons,
diff --git a/web/utils/tooltip-utils.js b/web/utils/tooltip-utils.js
--- a/web/utils/tooltip-utils.js
+++ b/web/utils/tooltip-utils.js
@@ -30,7 +30,6 @@
   useOnClickPendingSidebar,
   useOnClickThread,
 } from '../selectors/thread-selectors';
-import SWMansionIcon from '../SWMansionIcon.react';
 import { calculateMaxTextWidth } from '../utils/text-utils';
 
 export const tooltipPositions = Object.freeze({
@@ -469,7 +468,7 @@
       return null;
     }
 
-    const buttonContent = <SWMansionIcon icon="emote-smile" size={18} />;
+    const buttonContent = <CommIcon icon="emote-smile-filled" size={18} />;
 
     const onClickReact = () => {
       if (!setRenderEmojiKeyboard) {