diff --git a/app/src/main/res/drawable/bg_challenge_card.xml b/app/src/main/res/drawable/bg_challenge_card.xml
index 24b9807..f653ab9 100644
--- a/app/src/main/res/drawable/bg_challenge_card.xml
+++ b/app/src/main/res/drawable/bg_challenge_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/challenge_card_fill" />
+    <solid android:color="@color/cell_fill" />
     <corners android:radius="@dimen/radius_default" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_challenge.xml b/app/src/main/res/layout/fragment_add_challenge.xml
index 89ed8ba..1d806d6 100644
--- a/app/src/main/res/layout/fragment_add_challenge.xml
+++ b/app/src/main/res/layout/fragment_add_challenge.xml
@@ -39,7 +39,7 @@
             android:paddingHorizontal="@dimen/space_large"
             android:paddingVertical="@dimen/space_default"
             android:text="@={vm.input}"
-            android:textColor="@color/gray_4a"
+            android:textColor="@color/cell_label"
             android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/btn_next"
@@ -51,6 +51,7 @@
             android:layout_height="wrap_content"
             android:gravity="end"
             android:text="@{String.valueOf(vm.input.length())}"
+            android:textColor="@color/cell_label"
             android:textStyle="bold"
             app:layout_constraintBaseline_toBaselineOf="@id/tv_max"
             app:layout_constraintEnd_toStartOf="@id/tv_max"
@@ -63,6 +64,7 @@
             android:layout_margin="@dimen/space_default"
             android:gravity="end"
             android:text="/50"
+            android:textColor="@color/cell_label"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/et_new_challenge"
             app:layout_constraintEnd_toEndOf="@id/et_new_challenge" />
diff --git a/app/src/main/res/layout/fragment_check_challenge.xml b/app/src/main/res/layout/fragment_check_challenge.xml
index 79dfe90..a86a906 100644
--- a/app/src/main/res/layout/fragment_check_challenge.xml
+++ b/app/src/main/res/layout/fragment_check_challenge.xml
@@ -38,10 +38,11 @@
             android:minHeight="100dp"
             android:padding="@dimen/space_default"
             android:text="@{viewModel.lastChallenge.content}"
-            android:textColor="@color/gray_4a"
+            android:textColor="@color/cell_label"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@+id/rv_emoji"
-            app:layout_constraintTop_toBottomOf="@+id/tv_title_check" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_title_check"
+            tools:text="물 2L 마시기" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_emoji"
diff --git a/app/src/main/res/layout/fragment_notification_setting.xml b/app/src/main/res/layout/fragment_notification_setting.xml
index c87c2bb..c4a222b 100644
--- a/app/src/main/res/layout/fragment_notification_setting.xml
+++ b/app/src/main/res/layout/fragment_notification_setting.xml
@@ -39,7 +39,7 @@
             android:layout_marginTop="@dimen/space_default"
             android:gravity="center"
             android:text="@string/message_hrhn_summary"
-            android:textColor="@color/gray_54"
+            android:textColor="@color/dim"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_notification_message" />
@@ -48,7 +48,7 @@
             android:id="@+id/btn_time_picker"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:backgroundTint="@color/gray_f6"
+            android:backgroundTint="@color/cell_fill"
             android:insetTop="0dp"
             android:insetBottom="0dp"
             android:paddingHorizontal="@dimen/space_large"
@@ -56,6 +56,7 @@
             android:stateListAnimator="@null"
             android:textColor="@color/red_02"
             android:textSize="@dimen/text_size_body1"
+            app:cornerRadius="16dp"
             app:elevation="0dp"
             app:layout_constraintBottom_toTopOf="@id/btn_no_alarm"
             app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/space_text"
             android:text="@string/button_no_alarm"
-            android:textColor="@color/gray_54"
+            android:textColor="@color/dim"
             app:layout_constraintBottom_toTopOf="@+id/tv_notification_setting_message"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,7 +85,7 @@
             android:layout_marginBottom="@dimen/space_default"
             android:gravity="center"
             android:text="@string/message_notification_setting_info"
-            android:textColor="@color/gray_54"
+            android:textColor="@color/dim"
             app:layout_constraintBottom_toTopOf="@id/btn_set_alarm" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_past_challenge.xml b/app/src/main/res/layout/fragment_past_challenge.xml
index 2c8fd6c..d1ef7db 100644
--- a/app/src/main/res/layout/fragment_past_challenge.xml
+++ b/app/src/main/res/layout/fragment_past_challenge.xml
@@ -24,7 +24,7 @@
                 android:id="@+id/tb_past_challenge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|snap">
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                 <TextView
                     android:layout_width="match_parent"
@@ -41,7 +41,7 @@
             android:layout_height="match_parent"
             android:gravity="center"
             android:text="@string/message_empty_challenges"
-            android:textColor="@color/gray_81"
+            android:textColor="@color/secondary_label"
             android:visibleIf="@{vm.isEmpty()}" />
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_today.xml b/app/src/main/res/layout/fragment_today.xml
index 2a6846e..a439e9c 100644
--- a/app/src/main/res/layout/fragment_today.xml
+++ b/app/src/main/res/layout/fragment_today.xml
@@ -84,7 +84,7 @@
             android:onClick="@{()->vm.addTodayChallenge()}"
             android:text="@string/button_add_challenge"
             android:textAppearance="@style/CaptionText"
-            android:textColor="@color/reverse_label"
+            android:textColor="@color/white_label"
             app:cornerRadius="@dimen/radius_button"
             app:layout_constraintBottom_toBottomOf="@id/view_background"
             app:layout_constraintEnd_toEndOf="@id/tv_no_challenge"
@@ -99,7 +99,7 @@
             android:gravity="center"
             android:text="@{vm.todayChallenge.content}"
             android:textAppearance="@style/HeaderText"
-            android:textColor="@color/gray_4a"
+            android:textColor="@color/cell_label"
             android:visibleIf="@{!vm.isEmpty()}"
             app:layout_constraintBottom_toBottomOf="@id/view_background"
             app:layout_constraintEnd_toEndOf="@id/view_background"
diff --git a/app/src/main/res/layout/item_challenge.xml b/app/src/main/res/layout/item_challenge.xml
index 2f4e672..3f271d5 100644
--- a/app/src/main/res/layout/item_challenge.xml
+++ b/app/src/main/res/layout/item_challenge.xml
@@ -48,7 +48,7 @@
             android:layout_marginTop="@dimen/space_text"
             android:date="@{challenge.date}"
             android:textAppearance="@style/CaptionText"
-            android:textColor="@color/label"
+            android:textColor="@color/secondary_label"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/tv_emoji_label"
             app:layout_constraintStart_toStartOf="@id/tv_emoji_label"
@@ -61,9 +61,10 @@
             android:layout_height="0dp"
             android:layout_marginStart="10dp"
             android:ellipsize="end"
+            android:gravity="center_vertical"
             android:maxLines="3"
             android:text="@{challenge.content}"
-            android:textColor="@color/gray_81"
+            android:textColor="@color/cell_label"
             android:textSize="@dimen/text_size_body2"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/preference_time_picker.xml b/app/src/main/res/layout/preference_time_picker.xml
index 8c0240d..3c93073 100644
--- a/app/src/main/res/layout/preference_time_picker.xml
+++ b/app/src/main/res/layout/preference_time_picker.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/btn_time_picker"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/space_text"
-    android:backgroundTint="@color/gray_f6"
-    android:textColor="@color/red_02" />
\ No newline at end of file
+    android:backgroundTint="@color/cell_fill"
+    android:textColor="@color/red_02"
+    app:elevation="0dp" />
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 3260172..5d293d8 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -6,14 +6,12 @@
     <color name="quaternary_label">#2E3C3C43</color>
 
     <color name="header_label">@color/white</color>
-    <color name="challenge_card_fill">@color/black</color>
-    <color name="challenge_card_label">@color/black</color>
-    <color name="challenge_list_fill">@color/black</color>
-    <color name="challenge_list_label">@color/black</color>
-    <color name="challenge_label">@color/white</color>
-    <color name="disabled">@color/black</color>
-    <color name="dim">@color/black</color>
-    <color name="background">@color/black</color>
-    <color name="setting_icon_fill">@color/black</color>
-    <color name="reverse_label">@color/black</color>
+    <color name="disabled">@color/gray_1d</color>
+    <color name="disabled_label">@color/gray_59</color>
+    <color name="dim">@color/gray_d0</color>
+    <color name="background">@color/gray_14</color>
+    <color name="setting_icon_fill">@color/gray_c5</color>
+    <color name="white_label">@color/white</color>
+    <color name="cell_fill">@color/gray_22</color>
+    <color name="cell_label">@color/gray_d4</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 37b785e..1d162f7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,12 +5,19 @@
     <color name="clear">#00000000</color>
     <color name="checked">#4D000000</color>
     <color name="gray_fb">#FFFBFBFB</color>
+    <color name="gray_ef">#FFEFEFEF</color>
     <color name="gray_f6">#FFF6F6F6</color>
     <color name="gray_d4">#FFD4D4D4</color>
+    <color name="gray_d0">#FFD0D0D0</color>
     <color name="gray_c5">#FFC5C5C5</color>
     <color name="gray_81">#FF818181</color>
+    <color name="gray_b9">#FFB9B9B9</color>
+    <color name="gray_59">#FF595959</color>
     <color name="gray_54">#FF545454</color>
     <color name="gray_4a">#FF4A4A4A</color>
+    <color name="gray_22">#FF222222</color>
+    <color name="gray_1d">#FF1D1D1D</color>
+    <color name="gray_14">#FF141414</color>
     <color name="red_01">#FFFFBBAC</color>
     <color name="red_02">#DC6046</color>
     <color name="yellow_01">#FFFED977</color>
@@ -26,14 +33,12 @@
     <color name="quaternary_label">#2E3C3C43</color>
 
     <color name="header_label">@color/black</color>
-    <color name="challenge_card_fill">@color/gray_fb</color>
-    <color name="challenge_card_label">@color/gray_4a</color>
-    <color name="challenge_list_fill">@color/gray_f6</color>
-    <color name="challenge_list_label">@color/gray_81</color>
-    <color name="challenge_label">@color/gray_4a</color>
-    <color name="disabled">@color/gray_d4</color>
+    <color name="disabled">@color/gray_ef</color>
+    <color name="disabled_label">@color/gray_b9</color>
     <color name="dim">@color/gray_54</color>
     <color name="background">@color/white</color>
     <color name="setting_icon_fill">@color/gray_c5</color>
-    <color name="reverse_label">@color/white</color>
+    <color name="white_label">@color/white</color>
+    <color name="cell_fill">@color/gray_fb</color>
+    <color name="cell_label">@color/gray_4a</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style_button.xml b/app/src/main/res/values/style_button.xml
index 03f762f..9b92bbb 100644
--- a/app/src/main/res/values/style_button.xml
+++ b/app/src/main/res/values/style_button.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <style name="LargeButton" parent="Widget.MaterialComponents.Button">
+        <item name="android:textColor">@color/white_label</item>
         <item name="android:paddingVertical">@dimen/space_default</item>
     </style>
 
diff --git a/app/src/main/res/values/style_text.xml b/app/src/main/res/values/style_text.xml
index d711b4c..97b8466 100644
--- a/app/src/main/res/values/style_text.xml
+++ b/app/src/main/res/values/style_text.xml
@@ -17,7 +17,7 @@
     </style>
 
     <style name="FloatingText" parent="TextAppearance.AppCompat">
-        <item name="android:textColor">#D6D5D5</item>
+        <item name="android:textColor">@color/quaternary_label</item>
         <item name="android:textSize">20sp</item>
     </style>
 </resources>
\ No newline at end of file