diff --git a/package-lock.json b/package-lock.json
index 240aecf..94349f8 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 f75edad..6193f2a 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
 }
 
 export interface Tag {
diff --git a/src/ui/components/EmojiPicker.tsx b/src/ui/components/EmojiPicker.tsx
index 00bb54d..67bbbb2 100644
--- a/src/ui/components/EmojiPicker.tsx
+++ b/src/ui/components/EmojiPicker.tsx
@@ -1,5 +1,5 @@
+import React from 'react'
 import { BaseEmoji, Picker } from 'emoji-mart'
-import 'emoji-mart/css/emoji-mart.css'
 import { useAppSelector } from '../../store/hooks'
 import { selectMode } from '../../store/themeSlice'
 
diff --git a/src/ui/features/goalmanager/AddIconButton.tsx b/src/ui/features/goalmanager/AddIconButton.tsx
index d0c8c2c..b76aff4 100644
--- a/src/ui/features/goalmanager/AddIconButton.tsx
+++ b/src/ui/features/goalmanager/AddIconButton.tsx
@@ -1,3 +1,4 @@
+
 import { faSmile } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import 'date-fns'
diff --git a/src/ui/features/goalmanager/GoalManager.tsx b/src/ui/features/goalmanager/GoalManager.tsx
index 0779dda..3c69f00 100644
--- a/src/ui/features/goalmanager/GoalManager.tsx
+++ b/src/ui/features/goalmanager/GoalManager.tsx
@@ -3,6 +3,10 @@ import { faDollarSign, IconDefinition } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { MaterialUiPickersDate } from '@material-ui/pickers/typings/date'
 import 'date-fns'
+import { BaseEmoji } from 'emoji-mart'
+import EmojiPicker from '../../components/EmojiPicker'
+import GoalIcon from './GoalIcon'
+import AddIconButton from './AddIconButton'
 import React, { useEffect, useState } from 'react'
 import styled from 'styled-components'
 import { updateGoal as updateGoalApi } from '../../../api/lib'
@@ -21,17 +25,20 @@ 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)
-
-  useEffect(() => {
-    setName(props.goal.name)
-    setTargetDate(props.goal.targetDate)
-    setTargetAmount(props.goal.targetAmount)
-  }, [
-    props.goal.id,
-    props.goal.name,
-    props.goal.targetDate,
-    props.goal.targetAmount,
-  ])
+  const [icon, setIcon] = useState<string | null>(null)
+  const [emojiPickerIsOpen, setEmojiPickerIsOpen] = useState(false)
+
+useEffect(() => {
+  setName(goal.name)
+  setTargetDate(goal.targetDate)
+  setTargetAmount(goal.targetAmount)
+  setIcon(goal.icon ?? null)
+}, [
+  goal.name,
+  goal.targetDate,
+  goal.targetAmount,
+  goal.icon,
+])
 
   useEffect(() => {
     setName(goal.name)
@@ -74,10 +81,54 @@ export function GoalManager(props: Props) {
       updateGoalApi(props.goal.id, updatedGoal)
     }
   }
+const hasIcon = () => icon != null
+
+const addIconOnClick = (event: React.MouseEvent) => {
+  event.stopPropagation()
+  setEmojiPickerIsOpen(true)
+}
 
+const pickEmojiOnClick = (emoji: any, event: React.MouseEvent) => {
+  event.stopPropagation()
+
+  setIcon(emoji.native)
+  console.log('Selected emoji:', emoji.native)
+  setEmojiPickerIsOpen(false)
+
+  const updatedGoal: Goal = {
+    ...goal,
+    icon: emoji.native ?? props.goal.icon,
+    name: name ?? props.goal.name,
+    targetDate: targetDate ?? props.goal.targetDate,
+    targetAmount: targetAmount ?? props.goal.targetAmount,
+  }
+
+  dispatch(updateGoalRedux(updatedGoal))
+  console.log(updatedGoal)
+  updateGoalApi(props.goal.id, updatedGoal)
+}
   return (
-    <GoalManagerContainer>
-      <NameInput value={name ?? ''} onChange={updateNameOnChange} />
+<GoalManagerContainer>
+  <GoalIconContainer shouldShow={hasIcon()}>
+    <GoalIcon icon={icon} onClick={addIconOnClick} />
+  </GoalIconContainer>
+
+   <EmojiPickerContainer 
+     isOpen={emojiPickerIsOpen} 
+     
+     hasIcon={hasIcon()} 
+     onClick={(event: React.MouseEvent) => event.stopPropagation()}>
+    <EmojiPicker onClick={pickEmojiOnClick} />
+  </EmojiPickerContainer>
+
+  <AddIconButtonContainer shouldShow={hasIcon()}>
+    <AddIconButton
+      hasIcon={hasIcon()}
+      onClick={addIconOnClick}
+    />
+  </AddIconButtonContainer>
+
+  <NameInput value={name ?? ''} onChange={updateNameOnChange} />
 
       <Group>
         <Field name="Target Date" icon={faCalendarAlt} />
@@ -131,7 +182,19 @@ const GoalManagerContainer = styled.div`
   width: 100%;
   position: relative;
 `
+const GoalIconContainer = styled.div<GoalIconContainerProps>`
+  display: ${(props) => (props.shouldShow ? 'flex' : 'none')};
+`
 
+const AddIconButtonContainer = styled.div<AddIconButtonContainerProps>`
+  display: ${(props) => (props.shouldShow ? 'none' : 'flex')};
+`
+const EmojiPickerContainer = styled.div<EmojiPickerContainerProps>`
+  display: ${(props) => (props.isOpen ? 'flex' : 'none')};
+  position: absolute;
+  top: ${(props) => (props.hasIcon ? '10rem' : '2rem')};
+  left: 0;
+`
 const Group = styled.div`
   display: flex;
   flex-direction: row;
@@ -172,6 +235,7 @@ const StringValue = styled.h1`
 const StringInput = styled.input`
   display: flex;
   background-color: transparent;
+
   outline: none;
   border: none;
   font-size: 1.8rem;
diff --git a/src/ui/pages/Main/goals/GoalCard.tsx b/src/ui/pages/Main/goals/GoalCard.tsx
index e8f6d0a..b9af458 100644
--- a/src/ui/pages/Main/goals/GoalCard.tsx
+++ b/src/ui/pages/Main/goals/GoalCard.tsx
@@ -27,6 +27,7 @@ export default function GoalCard(props: Props) {
 
   return (
     <Container key={goal.id} onClick={onClick}>
+      <h1>{goal.icon}</h1>
       <TargetAmount>${goal.targetAmount}</TargetAmount>
       <TargetDate>{asLocaleDateString(goal.targetDate)}</TargetDate>
     </Container>