diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
index b6ee7ad0..aa0f98ca 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.*
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.view.WindowCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -53,7 +52,6 @@ class SettingsActivity : AppCompatActivity() {
                     }
                 }
                 SettingsScreen(
-                    topBarsScrolledContainerColor = Color(getColoredMaterialStatusBarColor().getContrastColor()),
                     preventPhoneFromSleeping = preventPhoneFromSleeping,
                     customizeColors = ::handleCustomizeColorsClick,
                     goBack = ::finish,
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt
index 6db63dcf..2bfefbda 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/screens/SettingsScreen.kt
@@ -63,6 +63,7 @@ fun SettingsScreen(
     SideEffect {
         systemUiController.setStatusBarColor(Color.Transparent, darkIcons = scrolledColor.isNotLitWell())
     }
+    val startingPadding = Modifier.padding(horizontal = 4.dp)
 
     Scaffold(
         modifier = Modifier
@@ -107,28 +108,34 @@ fun SettingsScreen(
                     .verticalScroll(rememberScrollState()),
             ) {
                 SettingsGroup(title = {
-                    SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization))
+                    SettingsTitleTextComponent(text = stringResource(id = R.string.color_customization), modifier = startingPadding)
                 }) {
                     SettingsPreferenceComponent(
-                        modifier = Modifier.padding(bottom = 12.dp),
+                        modifier = Modifier
+                            .padding(bottom = 12.dp, top = 8.dp)
+                            .then(startingPadding),
                         preferenceTitle = stringResource(id = R.string.customize_colors),
                         doOnPreferenceClick = customizeColors,
                         isPreferenceEnabled = isOrWasThankYouInstalled,
                         preferenceSummary = lockedCustomizeColorText
                     )
                     SettingsPreferenceComponent(
+                        modifier = Modifier
+                            .padding(bottom = 12.dp)
+                            .then(startingPadding),
                         preferenceTitle = stringResource(id = R.string.customize_widget_colors),
                         doOnPreferenceClick = customizeWidgetColors
                     )
                 }
                 Divider(color = divider_grey)
                 SettingsGroup(title = {
-                    SettingsTitleTextComponent(text = stringResource(id = R.string.general_settings))
+                    SettingsTitleTextComponent(text = stringResource(id = R.string.general_settings), modifier = startingPadding)
                 }) {
                     if (!isOrWasThankYouInstalled) {
                         SettingsPreferenceComponent(
                             preferenceTitle = stringResource(id = R.string.purchase_simple_thank_you),
                             doOnPreferenceClick = onThankYou,
+                            modifier = startingPadding,
                         )
                     }
                     if (isUseEnglishEnabled) {
@@ -136,6 +143,7 @@ fun SettingsScreen(
                             title = stringResource(id = R.string.use_english_language),
                             initialValue = isUseEnglishChecked,
                             onChange = onUseEnglishPress,
+                            modifier = startingPadding,
                         )
                     }
                     if (isTiramisuPlus()) {
@@ -144,22 +152,26 @@ fun SettingsScreen(
                             preferenceSummary = displayLanguage,
                             doOnPreferenceClick = onSetupLanguagePress,
                             preferenceSummaryColor = MaterialTheme.colorScheme.onSurface,
+                            modifier = startingPadding,
                         )
                     }
                     SettingsCheckBoxComponent(
                         title = stringResource(id = R.string.vibrate_on_button_press),
                         initialValue = vibrateOnButtonPressFlow,
                         onChange = onVibrateOnButtonPressFlow,
+                        modifier = startingPadding,
                     )
                     SettingsCheckBoxComponent(
                         title = stringResource(id = R.string.prevent_phone_from_sleeping),
                         initialValue = preventPhoneFromSleeping,
                         onChange = onPreventPhoneFromSleeping,
+                        modifier = startingPadding,
                     )
                     SettingsCheckBoxComponent(
                         title = stringResource(id = com.simplemobiletools.calculator.R.string.use_comma_as_decimal_mark),
                         initialValue = useCommaAsDecimalMarkFlow,
                         onChange = onUseCommaAsDecimalMarkFlow,
+                        modifier = startingPadding,
                     )
                 }
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt
index 6eae3472..4e3b268f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/compose/settings/SettingsPreferenceComponent.kt
@@ -31,14 +31,15 @@ fun SettingsPreferenceComponent(
     preferenceSummaryColor: Color = preferenceSummaryColor(isEnabled = isPreferenceEnabled)
 ) {
     Column(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxWidth()
             .combinedClickable(
                 enabled = isPreferenceEnabled,
                 onClick = { doOnPreferenceClick?.invoke() },
                 onLongClick = { doOnPreferenceLongClick?.invoke() },
             )
-            .padding(horizontal = 16.dp, vertical = 8.dp),
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+            .then(modifier),
     ) {
         Text(
             text = preferenceTitle,