diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index e203b41d1..4a5d1f027 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -38,11 +38,12 @@ jobs:
 
     - name: Set up Android SDK
       uses: android-actions/setup-android@v3
+      with:
+        packages: platform-tools
 
-    - name: Install Android SDK (API 35)
+    - name: Install Android SDK (API 36)
       run: |
-        sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0"
-        yes | sdkmanager --licenses
+        sdkmanager --install "platform-tools" "platforms;android-36" "build-tools;35.0.0"
 
     - name: Create Local Properties
       run: touch local.properties
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4286feb66..026933de5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,11 +93,12 @@ jobs:
 
       - name: Set up Android SDK
         uses: android-actions/setup-android@v3
+        with:
+          packages: platform-tools
 
-      - name: Install Android SDK (API 35)
+      - name: Install Android SDK (API 36)
         run: |
-          sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0"
-          yes | sdkmanager --licenses
+          sdkmanager --install "platform-tools" "platforms;android-36" "build-tools;35.0.0"
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
diff --git a/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt b/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt
index 472d7b77a..beaa02a81 100644
--- a/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt
+++ b/app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt
@@ -533,7 +533,7 @@ private fun FavoriteTabs(
             ) {
                 Text(
                     text = label,
-                    style = EatssuTheme.typography.h2,
+                    style = EatssuTheme.typography.subtitle2,
                     color = if (selectedPage == page) Primary else Gray400,
                     modifier = Modifier.padding(vertical = 18.dp),
                 )
@@ -611,7 +611,7 @@ private fun FavoriteFilters(
             val selected = selectedStoreType == type
             Text(
                 text = label,
-                style = EatssuTheme.typography.body3,
+                style = EatssuTheme.typography.body2,
                 fontWeight = if (selected) FontWeight.W500 else FontWeight.W400,
                 color = if (selected) Primary else Gray400,
                 modifier = Modifier
@@ -750,7 +750,7 @@ private fun FavoritePartnershipRow(
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(
                     text = item.storeName,
-                    style = EatssuTheme.typography.h2,
+                    style = EatssuTheme.typography.subtitle1,
                     color = Color.Black,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
@@ -758,7 +758,7 @@ private fun FavoritePartnershipRow(
                 Spacer(modifier = Modifier.width(8.dp))
                 Text(
                     text = item.storeType.value,
-                    style = EatssuTheme.typography.body3,
+                    style = EatssuTheme.typography.caption2,
                     color = Gray600,
                 )
             }