diff --git a/package-lock.json b/package-lock.json
index 240aecf2..94349f81 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -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"
diff --git a/src/api/types.ts b/src/api/types.ts
index f75edad0..5beff486 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -20,6 +20,7 @@ export interface Application {
 export interface Goal {
   id: string
   name: string
+  icon?: string
   targetAmount: number
   balance: number
   targetDate: Date
diff --git a/src/ui/features/goalmanager/GoalManager.tsx b/src/ui/features/goalmanager/GoalManager.tsx
index 0779ddaf..68fd4b9f 100644
--- a/src/ui/features/goalmanager/GoalManager.tsx
+++ b/src/ui/features/goalmanager/GoalManager.tsx
@@ -1,3 +1,5 @@
+import { Picker } from 'emoji-mart'
+import 'emoji-mart/css/emoji-mart.css'
 import { faCalendarAlt } from '@fortawesome/free-regular-svg-icons'
 import { faDollarSign, IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -21,64 +23,101 @@ 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>(props.goal.icon ?? '')
+  const [pickerOpen, setPickerOpen] = useState(false)
   useEffect(() => {
     setName(props.goal.name)
     setTargetDate(props.goal.targetDate)
     setTargetAmount(props.goal.targetAmount)
+    setIcon(props.goal.icon ?? '')
   }, [
-    props.goal.id,
-    props.goal.name,
-    props.goal.targetDate,
-    props.goal.targetAmount,
+    [
+  props.goal.id,
+  props.goal.name,
+  props.goal.targetDate,
+  props.goal.targetAmount,
+  props.goal.icon,
+]
   ])
 
   useEffect(() => {
-    setName(goal.name)
-  }, [goal.name])
+  setName(goal.name)
+  setIcon(goal.icon ?? '')
+}, [goal.name, goal.icon])
 
   const updateNameOnChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const nextName = event.target.value
-    setName(nextName)
-    const updatedGoal: Goal = {
-      ...props.goal,
-      name: nextName,
-    }
-    dispatch(updateGoalRedux(updatedGoal))
-    updateGoalApi(props.goal.id, updatedGoal)
+  const nextName = event.target.value
+  setName(nextName)
+
+  const updatedGoal: Goal = {
+    ...props.goal,
+    name: nextName,
+    icon: icon,
   }
 
+  dispatch(updateGoalRedux(updatedGoal))
+  updateGoalApi(props.goal.id, updatedGoal)
+}
+
   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,
+  ...props.goal,
+  name: name ?? props.goal.name,
+  targetDate: targetDate ?? props.goal.targetDate,
+  targetAmount: nextTargetAmount,
+  icon: icon,
     }
+    
     dispatch(updateGoalRedux(updatedGoal))
     updateGoalApi(props.goal.id, updatedGoal)
   }
+  const pickEmojiOnClick = (emoji: any) => {
+  const updatedGoal: Goal = {
+    ...props.goal,
+    name: name ?? props.goal.name,
+    targetDate: targetDate ?? props.goal.targetDate,
+    targetAmount: targetAmount ?? props.goal.targetAmount,
+    icon: emoji.native,
+  }
 
+  setIcon(emoji.native)
+  setPickerOpen(false)
+
+  dispatch(updateGoalRedux(updatedGoal))
+  updateGoalApi(props.goal.id, updatedGoal)
+}
   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,
-      }
-      dispatch(updateGoalRedux(updatedGoal))
-      updateGoalApi(props.goal.id, updatedGoal)
+  if (date != null) {
+    setTargetDate(date)
+
+    const updatedGoal: Goal = {
+      ...props.goal,
+      name: name ?? props.goal.name,
+      targetDate: date,
+      targetAmount: targetAmount ?? props.goal.targetAmount,
+      icon: icon,
     }
+
+    dispatch(updateGoalRedux(updatedGoal))
+    updateGoalApi(props.goal.id, updatedGoal)
   }
+}
 
   return (
     <GoalManagerContainer>
       <NameInput value={name ?? ''} onChange={updateNameOnChange} />
 
+<button onClick={() => setPickerOpen(!pickerOpen)}>
+  {icon || "😀"}
+</button>
+
+{pickerOpen && (
+  <Picker onSelect={pickEmojiOnClick} />
+)}
+
       <Group>
         <Field name="Target Date" icon={faCalendarAlt} />
         <Value>
diff --git a/src/ui/pages/Main/goals/GoalCard.tsx b/src/ui/pages/Main/goals/GoalCard.tsx
index e8f6d0a1..97bb2824 100644
--- a/src/ui/pages/Main/goals/GoalCard.tsx
+++ b/src/ui/pages/Main/goals/GoalCard.tsx
@@ -26,11 +26,14 @@ export default function GoalCard(props: Props) {
   const asLocaleDateString = (date: Date) => new Date(date).toLocaleDateString()
 
   return (
-    <Container key={goal.id} onClick={onClick}>
-      <TargetAmount>${goal.targetAmount}</TargetAmount>
-      <TargetDate>{asLocaleDateString(goal.targetDate)}</TargetDate>
-    </Container>
-  )
+  <Container key={goal.id} onClick={onClick}>
+    <Icon>{goal.icon || "🎯"}</Icon>
+
+    <TargetAmount>${goal.targetAmount}</TargetAmount>
+
+    <TargetDate>{asLocaleDateString(goal.targetDate)}</TargetDate>
+  </Container>
+)
 }
 
 const Container = styled(Card)`
@@ -46,6 +49,10 @@ const Container = styled(Card)`
 
   align-items: center;
 `
+const Icon = styled.div`
+  font-size: 3rem;
+  margin-top: 1rem;
+`
 const TargetAmount = styled.h2`
   font-size: 2rem;
 `