diff --git a/core/src/main/java/com/terning/core/designsystem/theme/Type.kt b/core/src/main/java/com/terning/core/designsystem/theme/Type.kt
index 1daae8d10..1c5310d08 100644
--- a/core/src/main/java/com/terning/core/designsystem/theme/Type.kt
+++ b/core/src/main/java/com/terning/core/designsystem/theme/Type.kt
@@ -10,6 +10,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
 import com.terning.core.R
 
@@ -237,177 +238,206 @@ fun TerningTypography(): TerningTypography {
     return TerningTypography(
         heading1 = TextStyle(
             fontFamily = PretendardSemiBold,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 23.sp,
-            letterSpacing = (-0.5).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (-0.005).em,
+            lineHeight = 23.sp,
         ),
         heading2 = TextStyle(
             fontFamily = PretendardSemiBold,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 21.sp,
-            letterSpacing = (-0.5).sp,
-            lineHeight = 130.sp,
+            letterSpacing = (-0.005).em,
+            lineHeight = (27.3).sp,
         ),
         title1 = TextStyle(
             fontFamily = PretendardSemiBold,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 19.sp,
-            letterSpacing = (-0.5).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (-0.005).em,
+            lineHeight = (22.8).sp,
         ),
         title2 = TextStyle(
             fontFamily = PretendardSemiBold,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 17.sp,
-            letterSpacing = (-0.5).sp,
-            lineHeight = 130.sp,
+            letterSpacing = (-0.005).em,
+            lineHeight = (22.1).sp,
         ),
         title3 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 17.sp,
-            letterSpacing = (-0.5).sp,
-            lineHeight = 130.sp,
+            letterSpacing = (-0.005).em,
+            lineHeight = (22.1).sp,
         ),
         title4 = TextStyle(
             fontFamily = PretendardSemiBold,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 15.sp,
-            letterSpacing = (-0.5).sp,
-            lineHeight = 130.sp,
+            letterSpacing = (-0.005).em,
+            lineHeight = (19.5).sp,
         ),
         title5 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 14.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (16.8).sp,
         ),
         body0 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 19.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 19.sp,
         ),
         body1 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 15.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 15.sp,
         ),
         body2 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 14.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (16.8).sp,
         ),
         body3 = TextStyle(
-            fontFamily = PretendardMedium,
+            fontFamily = PretendardRegular,
+            fontWeight = FontWeight.Normal,
             fontSize = 13.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (15.6).sp,
         ),
         body4 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 13.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 150.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (19.5).sp,
         ),
         body5 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 13.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (15.6).sp,
         ),
         body6 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 11.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (13.2).sp,
         ),
         body7 = TextStyle(
             fontFamily = PretendardLight,
+            fontWeight = FontWeight.Light,
             fontSize = 11.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 11.sp,
         ),
         button0 = TextStyle(
             fontFamily = PretendardSemiBold,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 15.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 15.sp,
         ),
         button1 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 15.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 15.sp,
         ),
         button2 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 15.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 18.sp,
         ),
         button3 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 13.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (15.6).sp,
         ),
         button4 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 11.sp,
-            letterSpacing = (0).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0).em,
+            lineHeight = 11.sp,
         ),
         button5 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 10.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 150.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 15.sp,
         ),
         button6 = TextStyle(
             fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
             fontSize = 9.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 9.sp,
         ),
         detail0 = TextStyle(
             fontFamily = PretendardSemiBold,
+            fontWeight = FontWeight.SemiBold,
             fontSize = 13.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 13.sp,
         ),
         detail1 = TextStyle(
             fontFamily = PretendardRegular,
+            fontWeight = FontWeight.Normal,
             fontSize = 13.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (15.6).sp,
         ),
         detail2 = TextStyle(
             fontFamily = PretendardLight,
+            fontWeight = FontWeight.Light,
             fontSize = 12.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (14.4).sp,
         ),
         detail3 = TextStyle(
             fontFamily = PretendardLight,
+            fontWeight = FontWeight.Light,
             fontSize = 11.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 120.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = (13.2).sp,
         ),
         detail4 = TextStyle(
             fontFamily = PretendardLight,
+            fontWeight = FontWeight.Light,
             fontSize = 10.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 10.sp,
         ),
         detail5 = TextStyle(
             fontFamily = PretendardLight,
+            fontWeight = FontWeight.Light,
             fontSize = 9.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 9.sp,
         ),
         calendar = TextStyle(
             fontFamily = PretendardRegular,
+            fontWeight = FontWeight.Normal,
             fontSize = 15.sp,
-            letterSpacing = (0.2).sp,
-            lineHeight = 100.sp,
+            letterSpacing = (0.002).em,
+            lineHeight = 15.sp,
         ),
     )
 }