diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/AllDiary.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/AllDiary.kt
index d72ddf0d..3b5210ee 100644
--- a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/AllDiary.kt
+++ b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/AllDiary.kt
@@ -143,20 +143,7 @@ private fun DiaryItemList(
             Box(modifier = Modifier.size(40.dp)) {
                 Image(
                     painterResource(
-                        id = when (emotion) {
-                            Emotion.HAPPY -> R.drawable.ic_happy
-                            Emotion.ANGRY -> R.drawable.ic_angry
-                            Emotion.ANNOYING -> R.drawable.ic_annoying
-                            Emotion.AWKWARDNESS -> R.drawable.ic_awkwardness
-                            Emotion.BOREDOM -> R.drawable.ic_boredom
-                            Emotion.SOBBING -> R.drawable.ic_sobbing
-                            Emotion.DEPRESSION -> R.drawable.ic_depression
-                            Emotion.PLEASED -> R.drawable.ic_pleased
-                            Emotion.DISCOMFORT -> R.drawable.ic_discomfort
-                            Emotion.SOSO -> R.drawable.ic_soso
-                            Emotion.SADNESS -> R.drawable.ic_sadness
-                            Emotion.SURPRISED -> R.drawable.ic_surprised
-                        }
+                        id = emotionDrawable(emotion)
                     ),
                     contentDescription = stringResource(id = R.string.diary_emotion_image),
                 )
diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/CreateDiary.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/CreateDiary.kt
index 6be6bc39..e3e34432 100644
--- a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/CreateDiary.kt
+++ b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/CreateDiary.kt
@@ -146,20 +146,7 @@ internal fun CreateDiary(
         Image(
             modifier = Modifier.signalClickable { showBottomSheet = true },
             painter = painterResource(
-                id = when (state.emotion) {
-                    Emotion.HAPPY -> R.drawable.ic_happy
-                    Emotion.SOSO -> R.drawable.ic_soso
-                    Emotion.DEPRESSION -> R.drawable.ic_depression
-                    Emotion.SADNESS -> R.drawable.ic_sadness
-                    Emotion.SURPRISED -> R.drawable.ic_surprised
-                    Emotion.DISCOMFORT -> R.drawable.ic_discomfort
-                    Emotion.PLEASED -> R.drawable.ic_pleased
-                    Emotion.ANGRY -> R.drawable.ic_angry
-                    Emotion.AWKWARDNESS -> R.drawable.ic_awkwardness
-                    Emotion.SOBBING -> R.drawable.ic_sobbing
-                    Emotion.ANNOYING -> R.drawable.ic_annoying
-                    Emotion.BOREDOM -> R.drawable.ic_boredom
-                }
+                id = emotionDrawable(state.emotion)
             ),
             contentDescription = stringResource(
                 id = R.string.create_diary_emotion_image
diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/Diary.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/Diary.kt
index 71fe060a..7c1bbbbe 100644
--- a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/Diary.kt
+++ b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/Diary.kt
@@ -250,24 +250,28 @@ internal fun DiaryItems(
             ) {
                 Image(
                     painterResource(
-                        id = when (emotion) {
-                            Emotion.HAPPY -> R.drawable.ic_happy
-                            Emotion.SOSO -> R.drawable.ic_soso
-                            Emotion.DEPRESSION -> R.drawable.ic_depression
-                            Emotion.SADNESS -> R.drawable.ic_sadness
-                            Emotion.SURPRISED -> R.drawable.ic_surprised
-                            Emotion.DISCOMFORT -> R.drawable.ic_discomfort
-                            Emotion.PLEASED -> R.drawable.ic_pleased
-                            Emotion.ANGRY -> R.drawable.ic_angry
-                            Emotion.AWKWARDNESS -> R.drawable.ic_awkwardness
-                            Emotion.SOBBING -> R.drawable.ic_sobbing
-                            Emotion.ANNOYING -> R.drawable.ic_annoying
-                            Emotion.BOREDOM -> R.drawable.ic_boredom
-                        }
+                        id = emotionDrawable(emotion)
                     ),
                     contentDescription = stringResource(id = R.string.diary_emotion_image),
                 )
             }
         }
     }
+}
+
+fun emotionDrawable(emotion: Emotion): Int {
+    return when (emotion) {
+        Emotion.HAPPY -> R.drawable.ic_happy
+        Emotion.SOSO -> R.drawable.ic_soso
+        Emotion.DEPRESSION -> R.drawable.ic_depression
+        Emotion.SADNESS -> R.drawable.ic_sadness
+        Emotion.SURPRISED -> R.drawable.ic_surprised
+        Emotion.DISCOMFORT -> R.drawable.ic_discomfort
+        Emotion.PLEASED -> R.drawable.ic_pleased
+        Emotion.ANGRY -> R.drawable.ic_angry
+        Emotion.AWKWARDNESS -> R.drawable.ic_awkwardness
+        Emotion.SOBBING -> R.drawable.ic_sobbing
+        Emotion.ANNOYING -> R.drawable.ic_annoying
+        Emotion.BOREDOM -> R.drawable.ic_boredom
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryDetail.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryDetail.kt
index bfef60f9..2600bbc5 100644
--- a/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryDetail.kt
+++ b/presentation/src/main/java/com/signal/signal_android/feature/main/diary/DiaryDetail.kt
@@ -95,20 +95,7 @@ internal fun DiaryDetail(
             Image(
                 modifier = Modifier.size(40.dp),
                 painter = painterResource(
-                    id = when (state.emotion) {
-                        HAPPY -> R.drawable.ic_happy
-                        SOSO -> R.drawable.ic_soso
-                        DEPRESSION -> R.drawable.ic_depression
-                        SADNESS -> R.drawable.ic_sadness
-                        SURPRISED -> R.drawable.ic_surprised
-                        DISCOMFORT -> R.drawable.ic_discomfort
-                        PLEASED -> R.drawable.ic_pleased
-                        ANGRY -> R.drawable.ic_angry
-                        AWKWARDNESS -> R.drawable.ic_awkwardness
-                        SOBBING -> R.drawable.ic_sobbing
-                        ANNOYING -> R.drawable.ic_annoying
-                        BOREDOM -> R.drawable.ic_boredom
-                    }
+                    id = emotionDrawable(state.emotion)
                 ),
                 contentDescription = stringResource(id = R.string.diary_emotion_image),
             )/*DiaryDropDown(