diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a9d07c2..0685a42 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,7 +37,7 @@ android {
         applicationId = "cn.super12138.todo"
         minSdk = 24
         targetSdk = 36
-        versionCode = 884
+        versionCode = 886
         versionName = "2.3.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt b/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt
index 8fac742..f5f09f4 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/TodoDefaults.kt
@@ -6,7 +6,12 @@ object TodoDefaults {
     /**
      * 屏幕左右两边预留边距（防止内容全部贴边显示过丑）
      */
-    val screenPadding = 16.dp
+    val screenHorizontalPadding = 16.dp
+
+    /**
+     * 屏幕上下预留边距（防止内容全部贴边显示过丑）
+     */
+    val screenVerticalPadding = 16.dp
 
     /**
      * 待办卡片默认高度
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt b/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt
index c5fbff3..d5f4e80 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/components/Scaffolds.kt
@@ -7,10 +7,13 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FabPosition
+import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.LargeTopAppBar
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.Text
@@ -33,7 +36,7 @@ import cn.super12138.todo.utils.VibrationUtils
  * @param onBack 当返回按钮被按下时的操作
  * @param contentWindowInsets 内容边距，通常用于将内容和系统状态栏等隔开；可以使用 `WindowInsets.safeContent`
  */
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun LargeTopAppBarScaffold(
     modifier: Modifier = Modifier,
@@ -56,7 +59,9 @@ fun LargeTopAppBarScaffold(
             )
         },
         navigationIcon = {
-            IconButton(
+            FilledIconButton(
+                colors = IconButtonDefaults.filledIconButtonColors(containerColor = MaterialTheme.colorScheme.surfaceContainerHigh),
+                shapes = IconButtonDefaults.shapes(),
                 onClick = {
                     VibrationUtils.performHapticFeedback(view)
                     onBack()
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt
index f64295e..8472b7a 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/crash/CrashPage.kt
@@ -114,7 +114,7 @@ fun CrashPage(
         Column(
             modifier = Modifier
                 .padding(innerPadding)
-                .padding(horizontal = TodoDefaults.screenPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
                 .fillMaxSize()
                 .verticalScroll(scrollState)
         ) {
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt
index 9f37c83..2e86810 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt
@@ -169,7 +169,7 @@ fun TodoEditorPage(
             verticalArrangement = Arrangement.spacedBy(5.dp),
             modifier = Modifier
                 .padding(innerPadding)
-                .padding(horizontal = TodoDefaults.screenPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
                 .fillMaxSize()
         ) {
             item {
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt
index 1517d59..c223134 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt
@@ -41,9 +41,9 @@ fun ManagerFragment(
         LazyColumn(
             state = state,
             contentPadding = PaddingValues(
-                start = TodoDefaults.screenPadding,
+                start = TodoDefaults.screenHorizontalPadding,
                 bottom = TodoDefaults.toDoCardHeight / 2,
-                end = TodoDefaults.screenPadding
+                end = TodoDefaults.screenHorizontalPadding
             ),
             /*modifier = Modifier
             .clip(
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAbout.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAbout.kt
index bc533ca..816c6c7 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAbout.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAbout.kt
@@ -2,9 +2,11 @@ package cn.super12138.todo.ui.pages.settings
 
 import android.widget.Toast
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Balance
 import androidx.compose.material.icons.outlined.DeveloperMode
@@ -12,7 +14,6 @@ import androidx.compose.material.icons.outlined.Numbers
 import androidx.compose.material.icons.outlined.Person4
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -22,7 +23,6 @@ import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
@@ -33,6 +33,7 @@ import cn.super12138.todo.constants.Constants
 import cn.super12138.todo.ui.TodoDefaults
 import cn.super12138.todo.ui.components.LargeTopAppBarScaffold
 import cn.super12138.todo.ui.icons.GitHubIcon
+import cn.super12138.todo.ui.pages.settings.components.Settings
 import cn.super12138.todo.ui.pages.settings.components.SettingsItem
 import cn.super12138.todo.utils.SystemUtils
 import kotlinx.coroutines.delay
@@ -56,15 +57,15 @@ fun SettingsAbout(
         val context = LocalContext.current
         val uriHandler = LocalUriHandler.current
 
-        LazyColumn(
+        Column(
             verticalArrangement = Arrangement.spacedBy(2.dp),
             modifier = Modifier
-                .fillMaxWidth()
+                .fillMaxSize()
                 .padding(innerPadding)
-                .padding(horizontal = TodoDefaults.screenPadding)
-                .clip(MaterialTheme.shapes.extraExtraLarge)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
+                .verticalScroll(rememberScrollState())
         ) {
-            item {
+            Settings {
                 var clickCount by remember { mutableIntStateOf(0) }
                 var lastClickTime by remember { mutableLongStateOf(0L) }
 
@@ -96,32 +97,24 @@ fun SettingsAbout(
                         }
                     }
                 )
-            }
-            item {
                 SettingsItem(
                     leadingIcon = Icons.Outlined.Person4,
                     title = stringResource(R.string.pref_developer),
                     description = stringResource(R.string.developer_name),
                     onClick = { uriHandler.openUri(Constants.DEVELOPER_GITHUB) }
                 )
-            }
-            item {
                 SettingsItem(
                     leadingIcon = GitHubIcon,
                     title = stringResource(R.string.pref_view_on_github),
                     description = stringResource(R.string.pref_view_on_github_desc),
                     onClick = { uriHandler.openUri(Constants.GITHUB_REPO) }
                 )
-            }
-            item {
                 SettingsItem(
                     leadingIcon = Icons.Outlined.Balance,
                     title = stringResource(R.string.pref_licence),
                     description = stringResource(R.string.pref_licence_desc),
                     onClick = toLicencePage
                 )
-            }
-            item {
                 SettingsItem(
                     leadingIcon = Icons.Outlined.DeveloperMode,
                     title = stringResource(R.string.pref_developer_options),
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt
index 91e7ddf..fd69873 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAboutLicence.kt
@@ -1,16 +1,20 @@
 package cn.super12138.todo.ui.pages.settings
 
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import cn.super12138.todo.R
+import cn.super12138.todo.ui.TodoDefaults
 import cn.super12138.todo.ui.components.LargeTopAppBarScaffold
 import cn.super12138.todo.ui.pages.settings.components.licence.LicenceList
 import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries
@@ -29,10 +33,17 @@ fun SettingsAboutLicence(
         modifier = modifier
     ) { innerPadding ->
         val libraries by produceLibraries(R.raw.aboutlibraries)
-        Column(
+        Box(
             modifier = Modifier
-                .padding(innerPadding)
                 .fillMaxSize()
+                .padding(innerPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
+                .clip(
+                    MaterialTheme.shapes.extraLarge.copy(
+                        bottomEnd = CornerSize(0f),
+                        bottomStart = CornerSize(0f)
+                    )
+                )
         ) {
             val listState = rememberLazyListState()
             LicenceList(
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt
index 824291e..f534369 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsAppearance.kt
@@ -19,7 +19,9 @@ import androidx.compose.ui.res.stringResource
 import cn.super12138.todo.R
 import cn.super12138.todo.constants.Constants
 import cn.super12138.todo.logic.datastore.DataStoreManager
+import cn.super12138.todo.ui.TodoDefaults
 import cn.super12138.todo.ui.components.LargeTopAppBarScaffold
+import cn.super12138.todo.ui.pages.settings.components.Settings
 import cn.super12138.todo.ui.pages.settings.components.SwitchSettingsItem
 import cn.super12138.todo.ui.pages.settings.components.appearance.contrast.ContrastPicker
 import cn.super12138.todo.ui.pages.settings.components.appearance.darkmode.DarkModePicker
@@ -52,33 +54,36 @@ fun SettingsAppearance(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(innerPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
                 .verticalScroll(rememberScrollState())
         ) {
-            SwitchSettingsItem(
-                checked = dynamicColor,
-                leadingIcon = Icons.Outlined.AutoAwesome,
-                title = stringResource(R.string.pref_appearance_dynamic_color),
-                description = stringResource(R.string.pref_appearance_dynamic_color_desc),
-                onCheckedChange = { scope.launch { DataStoreManager.setDynamicColor(it) } },
-            )
+            Settings {
+                SwitchSettingsItem(
+                    checked = dynamicColor,
+                    leadingIcon = Icons.Outlined.AutoAwesome,
+                    title = stringResource(R.string.pref_appearance_dynamic_color),
+                    description = stringResource(R.string.pref_appearance_dynamic_color_desc),
+                    onCheckedChange = { scope.launch { DataStoreManager.setDynamicColor(it) } },
+                )
 
-            DarkModePicker(
-                currentDarkMode = { DarkMode.fromId(darkMode) },
-                onDarkModeChange = { scope.launch { DataStoreManager.setDarkMode(it.id) } }
-            )
+                DarkModePicker(
+                    currentDarkMode = { DarkMode.fromId(darkMode) },
+                    onDarkModeChange = { scope.launch { DataStoreManager.setDarkMode(it.id) } }
+                )
 
-            PalettePicker(
-                currentPalette = { PaletteStyle.fromId(paletteStyle) },
-                onPaletteChange = { scope.launch { DataStoreManager.setPaletteStyle(it.id) } },
-                isDynamicColor = dynamicColor,
-                isDarkMode = DarkMode.fromId(darkMode),
-                contrastLevel = ContrastLevel.fromFloat(contrastLevel)
-            )
+                PalettePicker(
+                    currentPalette = { PaletteStyle.fromId(paletteStyle) },
+                    onPaletteChange = { scope.launch { DataStoreManager.setPaletteStyle(it.id) } },
+                    isDynamicColor = dynamicColor,
+                    isDarkMode = DarkMode.fromId(darkMode),
+                    contrastLevel = ContrastLevel.fromFloat(contrastLevel)
+                )
 
-            ContrastPicker(
-                currentContrast = ContrastLevel.fromFloat(contrastLevel),
-                onContrastChange = { scope.launch { DataStoreManager.setContrastLevel(it.value) } }
-            )
+                ContrastPicker(
+                    currentContrast = ContrastLevel.fromFloat(contrastLevel),
+                    onContrastChange = { scope.launch { DataStoreManager.setContrastLevel(it.value) } }
+                )
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt
index 15b3400..fe8d71d 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt
@@ -120,7 +120,7 @@ fun SettingsData(
             Modifier
                 .fillMaxSize()
                 .padding(innerPadding)
-                .padding(horizontal = TodoDefaults.screenPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
                 .verticalScroll(rememberScrollState())
         ) {
             SettingsCategory(stringResource(R.string.pref_category_data_management))
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDeveloperOptions.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDeveloperOptions.kt
index 490fd75..0ac78f2 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDeveloperOptions.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDeveloperOptions.kt
@@ -1,8 +1,10 @@
 package cn.super12138.todo.ui.pages.settings
 
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -12,7 +14,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import cn.super12138.todo.R
+import cn.super12138.todo.ui.TodoDefaults
 import cn.super12138.todo.ui.components.LargeTopAppBarScaffold
+import cn.super12138.todo.ui.pages.settings.components.Settings
 import cn.super12138.todo.ui.pages.settings.components.SettingsItem
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -29,12 +33,14 @@ fun SettingsDeveloperOptions(
         scrollBehavior = scrollBehavior,
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { innerPadding ->
-        LazyColumn(
+        Column(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(innerPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding,)
+                .verticalScroll(rememberScrollState())
         ) {
-            item {
+            Settings {
                 SettingsItem(
                     leadingIcon = Icons.Outlined.Padding,
                     title = stringResource(R.string.pref_padding),
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsInterfaceInteraction.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsInterfaceInteraction.kt
index 785ab7b..0936a40 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsInterfaceInteraction.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsInterfaceInteraction.kt
@@ -65,7 +65,7 @@ fun SettingsInterface(
             Modifier
                 .fillMaxSize()
                 .padding(innerPadding)
-                .padding(horizontal = TodoDefaults.screenPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
                 .verticalScroll(rememberScrollState())
         ) {
             SettingsCategory(stringResource(R.string.pref_category_todo_list))
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsMain.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsMain.kt
index 27ebe88..e19d509 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsMain.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsMain.kt
@@ -44,7 +44,7 @@ fun SettingsMain(
             Modifier
                 .fillMaxSize()
                 .padding(innerPadding)
-                .padding(horizontal = TodoDefaults.screenPadding)
+                .padding(horizontal = TodoDefaults.screenHorizontalPadding)
                 .verticalScroll(rememberScrollState())
         ) {
             Settings {
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt
index 1c96e51..f82c2fe 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/RowSettingsItem.kt
@@ -1,6 +1,7 @@
 package cn.super12138.todo.ui.pages.settings.components
 
 import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.background
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -40,7 +41,8 @@ fun RowSettingsItem(
     title: String,
     description: String? = null,
     trailingContent: (@Composable () -> Unit)? = null,
-    shape: Shape = MaterialTheme.shapes.large,
+    shape: Shape = MaterialTheme.shapes.small,
+    background: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
     horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
     verticalAlignment: Alignment.Vertical = Alignment.Top,
     scrollState: ScrollState = rememberScrollState(),
@@ -54,6 +56,7 @@ fun RowSettingsItem(
         description = description,
         trailingContent = trailingContent,
         shape = shape,
+        background = background,
         modifier = modifier
     ) {
         Row(
@@ -91,7 +94,8 @@ fun LazyRowSettingsItem(
     title: String,
     description: String? = null,
     trailingContent: (@Composable () -> Unit)? = null,
-    shape: Shape = MaterialTheme.shapes.large,
+    shape: Shape = MaterialTheme.shapes.small,
+    background: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
     horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
     verticalAlignment: Alignment.Vertical = Alignment.Top,
     fadedEdgeWidth: Dp,
@@ -104,6 +108,7 @@ fun LazyRowSettingsItem(
         description = description,
         trailingContent = trailingContent,
         shape = shape,
+        background = background,
         modifier = modifier
     ) {
         LazyRow(
@@ -140,7 +145,8 @@ fun MoreContentSettingsItem(
     title: String,
     description: String? = null,
     trailingContent: (@Composable () -> Unit)? = null,
-    shape: Shape = MaterialTheme.shapes.large,
+    shape: Shape = MaterialTheme.shapes.small,
+    background: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
     content: @Composable () -> Unit
 ) {
     Column(
@@ -148,6 +154,7 @@ fun MoreContentSettingsItem(
             .fillMaxWidth()
             .wrapContentHeight()
             .clip(shape)
+            .background(background)
             .padding(
                 horizontal = TodoDefaults.settingsItemHorizontalPadding,
                 vertical = TodoDefaults.settingsItemVerticalPadding
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsCategory.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsCategory.kt
index 4ae1d70..3d79d21 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsCategory.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsCategory.kt
@@ -21,7 +21,8 @@ fun SettingsCategory(
             .padding(
                 top = TodoDefaults.settingsItemVerticalPadding / 2,
                 start = TodoDefaults.settingsItemHorizontalPadding,
-                end = TodoDefaults.settingsItemHorizontalPadding
+                end = TodoDefaults.settingsItemHorizontalPadding,
+                bottom = TodoDefaults.settingsItemVerticalPadding / 4,
             )
     ) {
         Text(
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsContainer.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsContainer.kt
index dd746d0..18b2ae1 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsContainer.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsContainer.kt
@@ -3,12 +3,15 @@ package cn.super12138.todo.ui.pages.settings.components
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
+import cn.super12138.todo.ui.TodoDefaults
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
@@ -18,7 +21,10 @@ fun Settings(
 ) {
     Column(
         verticalArrangement = Arrangement.spacedBy(2.dp),
-        modifier = modifier.clip(MaterialTheme.shapes.extraExtraLarge),
+        modifier = modifier
+            .padding(vertical = TodoDefaults.screenVerticalPadding).clip(
+            shape = MaterialTheme.shapes.extraLarge
+        ),
         content = content
     )
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsDialogs.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsDialogs.kt
index 1dcd78e..827e330 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsDialogs.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsDialogs.kt
@@ -81,7 +81,7 @@ fun RadioItem(
                 },
                 role = Role.RadioButton
             )
-            .padding(horizontal = TodoDefaults.screenPadding),
+            .padding(horizontal = TodoDefaults.screenHorizontalPadding),
         verticalAlignment = Alignment.CenterVertically
     ) {
         RadioButton(
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsItem.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsItem.kt
index 55e8b75..a5a4fb0 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsItem.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/SettingsItem.kt
@@ -51,7 +51,7 @@ fun SettingsItem(
     title: String,
     description: String? = null,
     trailingContent: (@Composable () -> Unit)? = null,
-    background: Color = MaterialTheme.colorScheme.surfaceContainerHighest,
+    background: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
     enableClick: Boolean = true,
     onClick: () -> Unit = {}
 ) {
@@ -85,7 +85,7 @@ fun SettingsItem(
     description: String? = null,
     trailingContent: (@Composable () -> Unit)? = null,
     shape: Shape = MaterialTheme.shapes.small,
-    background: Color = MaterialTheme.colorScheme.surfaceContainerHighest,
+    background: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
     enableClick: Boolean = true,
     onClick: () -> Unit = {},
 ) {
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt
index 52c5442..d121879 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceItem.kt
@@ -1,5 +1,6 @@
 package cn.super12138.todo.ui.pages.settings.components.licence
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -34,11 +35,13 @@ fun LicenceItem(
     showAuthor: Boolean = true,
     showVersion: Boolean = true,
     showLicenseBadges: Boolean = true,
-    colors: LibraryColors = LibraryDefaults.libraryColors(),
+    colors: LibraryColors = LibraryDefaults.libraryColors(
+        libraryBackgroundColor = MaterialTheme.colorScheme.surfaceContainerHigh
+    ),
     padding: LibraryPadding = LibraryDefaults.libraryPadding(),
     libraryPadding: LibraryPadding = LibraryDefaults.libraryPadding(),
     typography: Typography = MaterialTheme.typography,
-    shape: Shape = MaterialTheme.shapes.large,
+    shape: Shape = MaterialTheme.shapes.small,
     onClick: () -> Unit
 ) {
     Column(
@@ -46,6 +49,7 @@ fun LicenceItem(
             .fillMaxWidth()
             .clip(shape)
             .clickable { onClick.invoke() }
+            .background(colors.libraryBackgroundColor)
             .padding(libraryPadding.contentPadding)
     ) {
         Row(
@@ -64,7 +68,7 @@ fun LicenceItem(
             val version = library.artifactVersion
             if (version != null && showVersion) {
                 Text(
-                    version,
+                    text = version,
                     modifier = Modifier.padding(padding.versionPadding.contentPadding),
                     style = typography.bodyMedium,
                     textAlign = TextAlign.Center
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceList.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceList.kt
index fc921d0..68776b1 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceList.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/components/licence/LicenceList.kt
@@ -1,5 +1,6 @@
 package cn.super12138.todo.ui.pages.settings.components.licence
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
@@ -21,6 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import cn.super12138.todo.R
 import cn.super12138.todo.ui.components.BasicDialog
 import cn.super12138.todo.ui.components.LazyColumnCustomScrollBar
@@ -44,9 +46,10 @@ fun LicenceList(
     ) {
         LazyColumn(
             state = state,
+            verticalArrangement = Arrangement.spacedBy(2.dp),
             modifier = modifier
         ) {
-            items(libraries?.libraries ?: listOf()) { library ->
+            items(items = libraries?.libraries ?: listOf(), key = { it.artifactId }) { library ->
                 var openDialog by rememberSaveable { mutableStateOf(false) }
 
                 LicenceItem(