diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt
index d27af20..175970e 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt
@@ -386,7 +386,7 @@ internal object IconButtonProperties {
     val ContentColor = ColorsDescriptor.ThemePrimary
     val BackgroundColor = Color.Transparent
     const val RippleBounded = false
-    val Padding = ComponentPadding()
+    val Padding = ComponentPadding.None
     val Shape = ShapesDescriptor.Tertiary
 }
 
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
index bbfaeb8..cd5e200 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
@@ -70,7 +70,7 @@ fun Scaffold(
     Surface(
         modifier = Modifier.fillMaxSize().then(modifier),
         colors = colors,
-        padding = ComponentPadding()
+        padding = ComponentPadding.None
     ) {
         ScaffoldLayout(
             padding = padding,
diff --git a/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt
index 130ebe5..77e5add 100644
--- a/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt
+++ b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/App.kt
@@ -59,7 +59,7 @@ private fun FlexiDemoTheme(content: @Composable () -> Unit) {
 fun App() {
     FlexiDemoTheme {
         // Surface will keep the content background color when animation.
-        Surface(padding = ComponentPadding()) {
+        Surface(padding = ComponentPadding.None) {
             Screen(Screen.Main) { MainScreen() }
             Screen(Screen.Secondary) { SecondaryScreen() }
             Screen(Screen.LazyList) { LazyListScreen() }