diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt
index af6ac3ab..c85504c3 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt
@@ -59,7 +59,7 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
-import com.sadellie.unitto.core.ui.theme.numbersDisplayLarge
+import com.sadellie.unitto.core.ui.theme.numberDisplayLarge
 import kotlin.math.ceil
 import kotlin.math.roundToInt
 
@@ -105,7 +105,7 @@ fun ExpressionTextField(
         modifier = modifier,
         value = value,
         formattedValue = value.text.formatExpression(formatterSymbols),
-        textStyle = MaterialTheme.typography.numbersDisplayLarge.copy(color = textColor),
+        textStyle = MaterialTheme.typography.numberDisplayLarge.copy(color = textColor),
         minRatio = minRatio,
         onValueChange = { onCursorChange(it.selection) },
         readOnly = readOnly,
@@ -157,7 +157,7 @@ fun UnformattedTextField(
     AutoSizableTextField(
         modifier = modifier,
         value = value,
-        textStyle = MaterialTheme.typography.numbersDisplayLarge.copy(color = textColor),
+        textStyle = MaterialTheme.typography.numberDisplayLarge.copy(color = textColor),
         minRatio = minRatio,
         onValueChange = { onCursorChange(it.selection) },
         readOnly = readOnly,
diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
index 94a2edd0..3ff4554a 100644
--- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
+++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
@@ -35,18 +35,18 @@ import androidx.compose.ui.unit.sp
 import com.sadellie.unitto.core.base.R
 
 // This text style is used for text field
-val Typography.numbersDisplayLarge by lazy {
+val Typography.numberDisplayLarge by lazy {
     TextStyle(
         fontFamily = latoFamily,
-        fontWeight = FontWeight.W400,
+        fontWeight = FontWeight.Normal,
         fontSize = 57.sp,
-        lineHeight = (1.4).em,
+        lineHeight = (1.25).em,
         letterSpacing = (-0.25).sp,
     )
 }
 
 // This text style is used for secondary text field
-val Typography.numbersDisplayMedium by lazy {
+val Typography.numberDisplayMedium by lazy {
     TextStyle(
         fontFamily = latoFamily,
         fontWeight = FontWeight.W400,
@@ -56,26 +56,6 @@ val Typography.numbersDisplayMedium by lazy {
     )
 }
 
-val Typography.numberBodyLarge: TextStyle by lazy {
-    TextStyle(
-        fontFamily = latoFamily,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 1.5.em,
-        letterSpacing = 0.5.sp,
-    )
-}
-
-val Typography.numberDisplayLarge: TextStyle by lazy {
-    TextStyle(
-        fontFamily = latoFamily,
-        fontWeight = FontWeight.Normal,
-        fontSize = 57.sp,
-        lineHeight = 1.25.em,
-        letterSpacing = (-0.25).sp,
-    )
-}
-
 val Typography.numberHeadlineSmall: TextStyle by lazy {
     TextStyle(
         fontFamily = latoFamily,
@@ -86,6 +66,16 @@ val Typography.numberHeadlineSmall: TextStyle by lazy {
     )
 }
 
+val Typography.numberBodyLarge: TextStyle by lazy {
+    TextStyle(
+        fontFamily = latoFamily,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 1.5.em,
+        letterSpacing = 0.5.sp,
+    )
+}
+
 val Typography.numberHeadlineMedium: TextStyle by lazy {
     TextStyle(
         fontFamily = latoFamily,
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
index 8d33ae3a..90cdc7dc 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
@@ -64,7 +64,7 @@ import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
 import com.sadellie.unitto.core.ui.common.textfield.UnittoTextToolbar
 import com.sadellie.unitto.core.ui.common.textfield.clearAndFilterExpression
 import com.sadellie.unitto.core.ui.common.textfield.copyWithoutGrouping
-import com.sadellie.unitto.core.ui.theme.numbersDisplayMedium
+import com.sadellie.unitto.core.ui.theme.numberDisplayMedium
 import com.sadellie.unitto.data.model.HistoryItem
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -190,7 +190,7 @@ private fun HistoryListItem(
                     .fillMaxWidth()
                     .padding(horizontal = 8.dp)
                     .horizontalScroll(rememberScrollState(), reverseScrolling = true),
-                textStyle = MaterialTheme.typography.numbersDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.End),
+                textStyle = MaterialTheme.typography.numberDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.End),
                 readOnly = true,
                 visualTransformation = ExpressionTransformer(formatterSymbols),
                 interactionSource = expressionInteractionSource
@@ -215,7 +215,7 @@ private fun HistoryListItem(
                     .fillMaxWidth()
                     .padding(horizontal = 8.dp)
                     .horizontalScroll(rememberScrollState(), reverseScrolling = true),
-                textStyle = MaterialTheme.typography.numbersDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), textAlign = TextAlign.End),
+                textStyle = MaterialTheme.typography.numberDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), textAlign = TextAlign.End),
                 readOnly = true,
                 visualTransformation = ExpressionTransformer(formatterSymbols),
                 interactionSource = resultInteractionSource
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
index faf1cf61..ae38843d 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
@@ -63,7 +63,7 @@ import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
 import com.sadellie.unitto.core.ui.common.UnittoSlider
 import com.sadellie.unitto.core.ui.common.squashable
 import com.sadellie.unitto.core.ui.common.textfield.formatExpression
-import com.sadellie.unitto.core.ui.theme.numbersDisplayMedium
+import com.sadellie.unitto.core.ui.theme.numberDisplayMedium
 import kotlin.math.roundToInt
 
 @Composable
@@ -139,7 +139,7 @@ fun FormattingScreen(
                     )
                     Text(
                         text = uiState.preview,
-                        style = MaterialTheme.typography.numbersDisplayMedium,
+                        style = MaterialTheme.typography.numberDisplayMedium,
                         maxLines = 1,
                         modifier = Modifier
                             .fillMaxWidth()