diff --git a/native/avatars/edit-thread-avatar.react.js b/native/avatars/edit-thread-avatar.react.js
index d0f38fa69..92b3a73e8 100644
--- a/native/avatars/edit-thread-avatar.react.js
+++ b/native/avatars/edit-thread-avatar.react.js
@@ -1,160 +1,159 @@
 // @flow
 
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import * as React from 'react';
 import { View, TouchableOpacity, Platform } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { useSelectAndUploadFromGallery } from './avatar-hooks.js';
-import CommIcon from '../components/comm-icon.react.js';
 import SWMansionIcon from '../components/swmansion-icon.react.js';
 import { useColors, useStyles } from '../themes/colors.js';
 
 type Props = {
   +children: React.Node,
   +onPressEmojiAvatarFlow: () => mixed,
   +disabled?: boolean,
 };
 function EditThreadAvatar(props: Props): React.Node {
   const { onPressEmojiAvatarFlow, children, disabled } = props;
   const { showActionSheetWithOptions } = useActionSheet();
 
   const colors = useColors();
   const styles = useStyles(unboundStyles);
 
   const selectAndUploadFromGallery = useSelectAndUploadFromGallery();
 
   const editAvatarOptions = React.useMemo(() => {
     const options = [
       {
         id: 'emoji',
         text: 'Use Emoji',
         onPress: onPressEmojiAvatarFlow,
         icon: (
-          <CommIcon
-            name="emote-smile-filled"
-            size={18}
+          <SWMansionIcon
+            name="emote-smile"
+            size={22}
             style={styles.bottomSheetIcon}
           />
         ),
       },
       {
         id: 'image',
         text: 'Select image',
         onPress: selectAndUploadFromGallery,
         icon: (
           <SWMansionIcon
             name="image-1"
-            size={18}
+            size={22}
             style={styles.bottomSheetIcon}
           />
         ),
       },
     ];
 
     if (Platform.OS === 'ios') {
       options.push({
         id: 'cancel',
         text: 'Cancel',
         isCancel: true,
       });
     }
     return options;
   }, [
     onPressEmojiAvatarFlow,
     selectAndUploadFromGallery,
     styles.bottomSheetIcon,
   ]);
 
   const insets = useSafeAreaInsets();
 
   const onPressEditAvatar = React.useCallback(() => {
     const texts = editAvatarOptions.map(option => option.text);
 
     const cancelButtonIndex = editAvatarOptions.findIndex(
       option => option.isCancel,
     );
 
     const containerStyle = {
       paddingBottom: insets.bottom,
     };
 
     const icons = editAvatarOptions.map(option => option.icon);
 
     const onPressAction = (selectedIndex: ?number) => {
       if (
         selectedIndex === null ||
         selectedIndex === undefined ||
         selectedIndex < 0
       ) {
         return;
       }
       const option = editAvatarOptions[selectedIndex];
       if (option.onPress) {
         option.onPress();
       }
     };
 
     showActionSheetWithOptions(
       {
         options: texts,
         cancelButtonIndex,
         containerStyle,
         icons,
       },
       onPressAction,
     );
   }, [editAvatarOptions, insets.bottom, showActionSheetWithOptions]);
 
   const editBadge = React.useMemo(() => {
     if (disabled) {
       return null;
     }
 
     return (
       <View style={styles.editAvatarIconContainer}>
         <SWMansionIcon
           name="edit-2"
           size={16}
           style={styles.editAvatarIcon}
           color={colors.floatingButtonLabel}
         />
       </View>
     );
   }, [
     colors.floatingButtonLabel,
     disabled,
     styles.editAvatarIcon,
     styles.editAvatarIconContainer,
   ]);
 
   return (
     <TouchableOpacity onPress={onPressEditAvatar} disabled={disabled}>
       {children}
       {editBadge}
     </TouchableOpacity>
   );
 }
 
 const unboundStyles = {
   editAvatarIconContainer: {
     position: 'absolute',
     bottom: 0,
     right: 0,
     borderWidth: 2,
     borderColor: 'panelForeground',
     borderRadius: 18,
     width: 36,
     height: 36,
     backgroundColor: 'purpleButton',
     justifyContent: 'center',
   },
   editAvatarIcon: {
     textAlign: 'center',
   },
   bottomSheetIcon: {
     color: '#000000',
   },
 };
 
 export default EditThreadAvatar;
diff --git a/native/avatars/edit-user-avatar.react.js b/native/avatars/edit-user-avatar.react.js
index 08234f890..67742f280 100644
--- a/native/avatars/edit-user-avatar.react.js
+++ b/native/avatars/edit-user-avatar.react.js
@@ -1,160 +1,159 @@
 // @flow
 
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import * as React from 'react';
 import { View, TouchableOpacity, Platform } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { useSelectAndUploadFromGallery } from './avatar-hooks.js';
-import CommIcon from '../components/comm-icon.react.js';
 import SWMansionIcon from '../components/swmansion-icon.react.js';
 import { useColors, useStyles } from '../themes/colors.js';
 
 type Props = {
   +children: React.Node,
   +onPressEmojiAvatarFlow: () => mixed,
   +disabled?: boolean,
 };
 function EditUserAvatar(props: Props): React.Node {
   const { onPressEmojiAvatarFlow, children, disabled } = props;
   const { showActionSheetWithOptions } = useActionSheet();
 
   const colors = useColors();
   const styles = useStyles(unboundStyles);
 
   const selectAndUploadFromGallery = useSelectAndUploadFromGallery();
 
   const editAvatarOptions = React.useMemo(() => {
     const options = [
       {
         id: 'emoji',
         text: 'Use Emoji',
         onPress: onPressEmojiAvatarFlow,
         icon: (
-          <CommIcon
-            name="emote-smile-filled"
-            size={18}
+          <SWMansionIcon
+            name="emote-smile"
+            size={22}
             style={styles.bottomSheetIcon}
           />
         ),
       },
       {
         id: 'image',
         text: 'Select image',
         onPress: selectAndUploadFromGallery,
         icon: (
           <SWMansionIcon
             name="image-1"
-            size={18}
+            size={22}
             style={styles.bottomSheetIcon}
           />
         ),
       },
     ];
 
     if (Platform.OS === 'ios') {
       options.push({
         id: 'cancel',
         text: 'Cancel',
         isCancel: true,
       });
     }
     return options;
   }, [
     onPressEmojiAvatarFlow,
     selectAndUploadFromGallery,
     styles.bottomSheetIcon,
   ]);
 
   const insets = useSafeAreaInsets();
 
   const onPressEditAvatar = React.useCallback(() => {
     const texts = editAvatarOptions.map(option => option.text);
 
     const cancelButtonIndex = editAvatarOptions.findIndex(
       option => option.isCancel,
     );
 
     const containerStyle = {
       paddingBottom: insets.bottom,
     };
 
     const icons = editAvatarOptions.map(option => option.icon);
 
     const onPressAction = (selectedIndex: ?number) => {
       if (
         selectedIndex === null ||
         selectedIndex === undefined ||
         selectedIndex < 0
       ) {
         return;
       }
       const option = editAvatarOptions[selectedIndex];
       if (option.onPress) {
         option.onPress();
       }
     };
 
     showActionSheetWithOptions(
       {
         options: texts,
         cancelButtonIndex,
         containerStyle,
         icons,
       },
       onPressAction,
     );
   }, [editAvatarOptions, insets.bottom, showActionSheetWithOptions]);
 
   const editBadge = React.useMemo(() => {
     if (disabled) {
       return null;
     }
 
     return (
       <View style={styles.editAvatarIconContainer}>
         <SWMansionIcon
           name="edit-2"
           size={16}
           style={styles.editAvatarIcon}
           color={colors.floatingButtonLabel}
         />
       </View>
     );
   }, [
     colors.floatingButtonLabel,
     disabled,
     styles.editAvatarIcon,
     styles.editAvatarIconContainer,
   ]);
 
   return (
     <TouchableOpacity onPress={onPressEditAvatar} disabled={disabled}>
       {children}
       {editBadge}
     </TouchableOpacity>
   );
 }
 
 const unboundStyles = {
   editAvatarIconContainer: {
     position: 'absolute',
     bottom: 0,
     right: 0,
     borderWidth: 2,
     borderColor: 'panelForeground',
     borderRadius: 18,
     width: 36,
     height: 36,
     backgroundColor: 'purpleButton',
     justifyContent: 'center',
   },
   editAvatarIcon: {
     textAlign: 'center',
   },
   bottomSheetIcon: {
     color: '#000000',
   },
 };
 
 export default EditUserAvatar;