diff --git a/package-lock.json b/package-lock.json
index 240aecf..cbf52f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,6 @@
         "@material-ui/core": "^4.12.4",
         "@material-ui/pickers": "^3.3.10",
         "@reduxjs/toolkit": "^1.5.1",
-        "@types/emoji-mart": "^3.0.5",
         "@types/node": "^17.0.41",
         "@types/react": "^16.9.0",
         "@types/react-redux": "^7.1.7",
@@ -35,7 +34,7 @@
         "web-vitals": "^2.1.4"
       },
       "devDependencies": {
-        "@types/emoji-mart": "^3.0.9",
+        "@types/emoji-mart": "^3.0.14",
         "@types/react-dom": "^18.0.5",
         "@types/styled-components": "^5.1.25"
       }
@@ -3699,10 +3698,11 @@
       }
     },
     "node_modules/@types/emoji-mart": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.9.tgz",
-      "integrity": "sha512-qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA==",
+      "version": "3.0.14",
+      "resolved": "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.14.tgz",
+      "integrity": "sha512-/vMkVnet466bK37ugf2jry9ldCZklFPXYMB2m+qNo3vkP2I7L0cvtNFPKAjfcHgPg9Z8pbYqVqZn7AgsC0qf+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
@@ -6611,6 +6611,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/emoji-mart/-/emoji-mart-3.0.1.tgz",
       "integrity": "sha512-sxpmMKxqLvcscu6mFn9ITHeZNkGzIvD0BSNFE/LJESPbCA8s1jM6bCDPjWbV31xHq7JXaxgpHxLB54RCbBZSlg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
         "prop-types": "^15.6.0"
@@ -19308,9 +19309,9 @@
       }
     },
     "@types/emoji-mart": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.9.tgz",
-      "integrity": "sha512-qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA==",
+      "version": "3.0.14",
+      "resolved": "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.14.tgz",
+      "integrity": "sha512-/vMkVnet466bK37ugf2jry9ldCZklFPXYMB2m+qNo3vkP2I7L0cvtNFPKAjfcHgPg9Z8pbYqVqZn7AgsC0qf+g==",
       "dev": true,
       "requires": {
         "@types/react": "*"
diff --git a/package.json b/package.json
index 87958ce..9291828 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
     "@material-ui/core": "^4.12.4",
     "@material-ui/pickers": "^3.3.10",
     "@reduxjs/toolkit": "^1.5.1",
-    "@types/emoji-mart": "^3.0.5",
     "@types/node": "^17.0.41",
     "@types/react": "^16.9.0",
     "@types/react-redux": "^7.1.7",
@@ -55,8 +54,8 @@
     ]
   },
   "devDependencies": {
-    "@types/emoji-mart": "^3.0.9",
+    "@types/emoji-mart": "^3.0.14",
     "@types/react-dom": "^18.0.5",
     "@types/styled-components": "^5.1.25"
   }
-}
\ No newline at end of file
+}
diff --git a/src/api/types.ts b/src/api/types.ts
index f75edad..526257f 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -27,6 +27,7 @@ export interface Goal {
   accountId: string
   transactionIds: string[]
   tagIds: string[]
+  icon?: string | null
 }
 
 export interface Tag {
diff --git a/src/ui/features/goalmanager/GoalManager.tsx b/src/ui/features/goalmanager/GoalManager.tsx
index 0779dda..34bcabe 100644
--- a/src/ui/features/goalmanager/GoalManager.tsx
+++ b/src/ui/features/goalmanager/GoalManager.tsx
@@ -1,3 +1,7 @@
+import { Picker } from 'emoji-mart'
+import 'emoji-mart/css/emoji-mart.css'
+import AddIconButton from './AddIconButton'
+import GoalIcon from './GoalIcon'
 import { faCalendarAlt } from '@fortawesome/free-regular-svg-icons'
 import { faDollarSign, IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -7,7 +11,10 @@ import React, { useEffect, useState } from 'react'
 import styled from 'styled-components'
 import { updateGoal as updateGoalApi } from '../../../api/lib'
 import { Goal } from '../../../api/types'
-import { selectGoalsMap, updateGoal as updateGoalRedux } from '../../../store/goalsSlice'
+import {
+  selectGoalsMap,
+  updateGoal as updateGoalRedux,
+} from '../../../store/goalsSlice'
 import { useAppDispatch, useAppSelector } from '../../../store/hooks'
 import DatePicker from '../../components/DatePicker'
 import { Theme } from '../../components/Theme'
@@ -21,99 +28,186 @@ export function GoalManager(props: Props) {
   const [name, setName] = useState<string | null>(null)
   const [targetDate, setTargetDate] = useState<Date | null>(null)
   const [targetAmount, setTargetAmount] = useState<number | null>(null)
+  const [icon, setIcon] = useState<string | null>(null)
+  const [isEmojiPickerOpen, setIsEmojiPickerOpen] = useState(false)
 
   useEffect(() => {
     setName(props.goal.name)
     setTargetDate(props.goal.targetDate)
     setTargetAmount(props.goal.targetAmount)
+    setIcon(props.goal.icon ?? null)
   }, [
     props.goal.id,
     props.goal.name,
     props.goal.targetDate,
     props.goal.targetAmount,
+    props.goal.icon,
   ])
 
   useEffect(() => {
-    setName(goal.name)
-  }, [goal.name])
+    if (goal) {
+      setName(goal.name)
+      setIcon(goal.icon ?? null)
+    }
+  }, [goal?.name, goal?.icon])
 
-  const updateNameOnChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+  const updateNameOnChange = (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
     const nextName = event.target.value
     setName(nextName)
+
     const updatedGoal: Goal = {
       ...props.goal,
       name: nextName,
+      icon: icon ?? props.goal.icon,
     }
+
     dispatch(updateGoalRedux(updatedGoal))
     updateGoalApi(props.goal.id, updatedGoal)
   }
 
-  const updateTargetAmountOnChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+  const updateTargetAmountOnChange = (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
     const nextTargetAmount = parseFloat(event.target.value)
     setTargetAmount(nextTargetAmount)
+
     const updatedGoal: Goal = {
       ...props.goal,
       name: name ?? props.goal.name,
       targetDate: targetDate ?? props.goal.targetDate,
       targetAmount: nextTargetAmount,
+      icon: icon ?? props.goal.icon,
     }
+
     dispatch(updateGoalRedux(updatedGoal))
     updateGoalApi(props.goal.id, updatedGoal)
   }
 
-  const pickDateOnChange = (date: MaterialUiPickersDate) => {
+  const pickDateOnChange = (
+    date: MaterialUiPickersDate
+  ) => {
     if (date != null) {
       setTargetDate(date)
+
       const updatedGoal: Goal = {
         ...props.goal,
         name: name ?? props.goal.name,
         targetDate: date ?? props.goal.targetDate,
         targetAmount: targetAmount ?? props.goal.targetAmount,
+        icon: icon ?? props.goal.icon,
       }
+
       dispatch(updateGoalRedux(updatedGoal))
       updateGoalApi(props.goal.id, updatedGoal)
     }
   }
 
+  const onEmojiSelect = (emoji: any) => {
+    setIcon(emoji.native)
+    setIsEmojiPickerOpen(false)
+
+    const updatedGoal: Goal = {
+      ...props.goal,
+      name: name ?? props.goal.name,
+      targetDate: targetDate ?? props.goal.targetDate,
+      targetAmount: targetAmount ?? props.goal.targetAmount,
+      icon: emoji.native,
+    }
+
+    dispatch(updateGoalRedux(updatedGoal))
+    updateGoalApi(props.goal.id, updatedGoal)
+  }
+
   return (
     <GoalManagerContainer>
-      <NameInput value={name ?? ''} onChange={updateNameOnChange} />
+
+      {icon ? (
+        <GoalIcon
+          icon={icon}
+          onClick={() =>
+            setIsEmojiPickerOpen(!isEmojiPickerOpen)
+          }
+        />
+      ) : (
+        <AddIconButton
+          hasIcon={false}
+          onClick={() =>
+            setIsEmojiPickerOpen(!isEmojiPickerOpen)
+          }
+        />
+      )}
+
+      {isEmojiPickerOpen && (
+        <Picker
+          title="Pick your emoji"
+          onSelect={onEmojiSelect}
+        />
+      )}
+
+      <NameInput
+        value={name ?? ''}
+        onChange={updateNameOnChange}
+      />
 
       <Group>
-        <Field name="Target Date" icon={faCalendarAlt} />
+        <Field
+          name="Target Date"
+          icon={faCalendarAlt}
+        />
         <Value>
-          <DatePicker value={targetDate} onChange={pickDateOnChange} />
+          <DatePicker
+            value={targetDate}
+            onChange={pickDateOnChange}
+          />
         </Value>
       </Group>
 
       <Group>
-        <Field name="Target Amount" icon={faDollarSign} />
+        <Field
+          name="Target Amount"
+          icon={faDollarSign}
+        />
         <Value>
-          <StringInput value={targetAmount ?? ''} onChange={updateTargetAmountOnChange} />
+          <StringInput
+            value={targetAmount ?? ''}
+            onChange={updateTargetAmountOnChange}
+          />
         </Value>
       </Group>
 
       <Group>
-        <Field name="Balance" icon={faDollarSign} />
+        <Field
+          name="Balance"
+          icon={faDollarSign}
+        />
         <Value>
-          <StringValue>{props.goal.balance}</StringValue>
+          <StringValue>
+            {props.goal.balance}
+          </StringValue>
         </Value>
       </Group>
 
       <Group>
-        <Field name="Date Created" icon={faCalendarAlt} />
+        <Field
+          name="Date Created"
+          icon={faCalendarAlt}
+        />
         <Value>
-          <StringValue>{new Date(props.goal.created).toLocaleDateString()}</StringValue>
+          <StringValue>
+            {new Date(
+              props.goal.created
+            ).toLocaleDateString()}
+          </StringValue>
         </Value>
       </Group>
+
     </GoalManagerContainer>
   )
 }
 
 type FieldProps = { name: string; icon: IconDefinition }
-type AddIconButtonContainerProps = { shouldShow: boolean }
-type GoalIconContainerProps = { shouldShow: boolean }
-type EmojiPickerContainerProps = { isOpen: boolean; hasIcon: boolean }
 
 const Field = (props: FieldProps) => (
   <FieldContainer>
diff --git a/src/ui/pages/Main/goals/GoalCard.tsx b/src/ui/pages/Main/goals/GoalCard.tsx
index e8f6d0a..57e6756 100644
--- a/src/ui/pages/Main/goals/GoalCard.tsx
+++ b/src/ui/pages/Main/goals/GoalCard.tsx
@@ -27,6 +27,9 @@ export default function GoalCard(props: Props) {
 
   return (
     <Container key={goal.id} onClick={onClick}>
+      {goal.icon && <GoalIcon>{goal.icon}</GoalIcon>}
+      {goal.icon && <GoalEmoji>{goal.icon}</GoalEmoji>}
+      {goal.icon && <h1>{goal.icon}</h1>}
       <TargetAmount>${goal.targetAmount}</TargetAmount>
       <TargetDate>{asLocaleDateString(goal.targetDate)}</TargetDate>
     </Container>
@@ -46,6 +49,14 @@ const Container = styled(Card)`
 
   align-items: center;
 `
+const GoalIcon = styled.h1`
+  font-size: 3rem;
+  margin: 0;
+`
+const GoalEmoji = styled.h1`
+  font-size: 3rem;
+  margin: 0;
+`
 const TargetAmount = styled.h2`
   font-size: 2rem;
 `