diff --git a/web/avatars/edit-user-avatar-menu.react.js b/web/avatars/edit-user-avatar-menu.react.js
new file mode 100644
index 000000000..411ff1f41
--- /dev/null
+++ b/web/avatars/edit-user-avatar-menu.react.js
@@ -0,0 +1,34 @@
+// @flow
+
+import * as React from 'react';
+
+import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
+
+import MenuItem from '../components/menu-item.react.js';
+import Menu from '../components/menu.react.js';
+
+const editIcon = <SWMansionIcon icon="edit-2" size={20} />;
+
+function EditUserAvatarMenu(): React.Node {
+  const emojiMenuItem = React.useMemo(
+    () => <MenuItem key="emoji" text="Select emoji" icon="emote-smile" />,
+    [],
+  );
+  const imageMenuItem = React.useMemo(
+    () => <MenuItem key="image" text="Select image" icon="image-1" />,
+    [],
+  );
+  const removeMenuItem = React.useMemo(
+    () => <MenuItem key="remove" text="Reset to default" icon="trash-2" />,
+    [],
+  );
+
+  const menuItems = React.useMemo(
+    () => [emojiMenuItem, imageMenuItem, removeMenuItem],
+    [emojiMenuItem, imageMenuItem, removeMenuItem],
+  );
+
+  return <Menu icon={editIcon}>{menuItems}</Menu>;
+}
+
+export default EditUserAvatarMenu;
diff --git a/web/avatars/edit-user-avatar.react.js b/web/avatars/edit-user-avatar.react.js
index ccf44b9df..35da8cc7e 100644
--- a/web/avatars/edit-user-avatar.react.js
+++ b/web/avatars/edit-user-avatar.react.js
@@ -1,26 +1,26 @@
 // @flow
 
 import * as React from 'react';
 
-import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
-
+import EditUserAvatarMenu from './edit-user-avatar-menu.react.js';
 import css from './edit-user-avatar.css';
 import UserAvatar from './user-avatar.react.js';
 
 type Props = {
   +userID: ?string,
   +disabled?: boolean,
 };
 function EditUserAvatar(props: Props): React.Node {
   const { userID } = props;
+
   return (
     <div className={css.editUserAvatarContainer}>
       <UserAvatar userID={userID} size="profile" />
       <div className={css.editAvatarBadge}>
-        <SWMansionIcon icon="edit-2" size={20} />
+        <EditUserAvatarMenu />
       </div>
     </div>
   );
 }
 
 export default EditUserAvatar;