diff --git a/app/src/main/java/pl/lambada/songsync/ui/components/SettingsHeadLabel.kt b/app/src/main/java/pl/lambada/songsync/ui/components/SettingsHeadLabel.kt
new file mode 100644
index 00000000..257a8450
--- /dev/null
+++ b/app/src/main/java/pl/lambada/songsync/ui/components/SettingsHeadLabel.kt
@@ -0,0 +1,25 @@
+package pl.lambada.songsync.ui.components
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun SettingsHeadLabel(
+    label: String,
+) {
+    Text(
+        text = label,
+        style = MaterialTheme.typography.labelMedium,
+        modifier = Modifier.padding(
+            start = 22.dp,
+            top = 22.dp,
+            end = 22.dp,
+            bottom = 0.dp
+        ),
+        color = MaterialTheme.colorScheme.primary
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/components/SettingsItem.kt b/app/src/main/java/pl/lambada/songsync/ui/components/SettingsItem.kt
deleted file mode 100644
index f0d77be8..00000000
--- a/app/src/main/java/pl/lambada/songsync/ui/components/SettingsItem.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package pl.lambada.songsync.ui.components
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun SettingsItem(
-    label: String,
-    modifier: Modifier = Modifier,
-    content: @Composable () -> Unit,
-) {
-    Column(modifier = Modifier.fillMaxWidth()) {
-        Text(
-            text = label,
-            style = MaterialTheme.typography.labelMedium,
-            modifier = Modifier.padding(
-                start = 22.dp,
-                top = 22.dp,
-                end = 22.dp,
-                bottom = 0.dp
-            ),
-            color = MaterialTheme.colorScheme.primary
-        )
-        Column(modifier = modifier) { content() }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/components/SwitchItem.kt b/app/src/main/java/pl/lambada/songsync/ui/components/SwitchItem.kt
index 80a58086..42c57ed1 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/components/SwitchItem.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/components/SwitchItem.kt
@@ -1,18 +1,22 @@
 package pl.lambada.songsync.ui.components
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.CombinedModifier
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 
 @Composable
 fun SwitchItem(
@@ -23,6 +27,7 @@ fun SwitchItem(
         horizontal = 22.dp,
         vertical = 16.dp
     ),
+    description: String = "",
     onClick: () -> Unit,
 ) {
     Row(
@@ -34,10 +39,21 @@ fun SwitchItem(
         ),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Text(
-            text = label,
+        Column(
             modifier = Modifier.weight(1f),
-        )
+        ) {
+            Text(
+                text = label,
+            )
+            if (description.isNotEmpty() == true) {
+                Text(
+                    text = description,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    fontSize = 12.sp,
+                    lineHeight = 16.sp,
+                )
+            }
+        }
         Spacer(modifier = Modifier.width(12.dp))
         Switch(
             checked = selected,
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/SettingsScreen.kt
index 8d925c3d..d72dcba4 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/SettingsScreen.kt
@@ -19,6 +19,7 @@ import androidx.navigation.NavController
 import pl.lambada.songsync.R
 import pl.lambada.songsync.data.remote.UpdateState
 import pl.lambada.songsync.data.UserSettingsController
+import pl.lambada.songsync.ui.components.SettingsHeadLabel
 import pl.lambada.songsync.ui.screens.settings.components.OffsetModeSwitch
 import pl.lambada.songsync.ui.screens.settings.components.SettingsScreenTopBar
 import pl.lambada.songsync.ui.screens.settings.components.AppInfoSection
@@ -65,20 +66,19 @@ fun SettingsScreen(
             modifier = Modifier.fillMaxWidth(),
             contentPadding = paddingValues
         ) {
+            item { SettingsHeadLabel(label = stringResource(id = R.string.theme)) }
             item {
                 if (isSystemInDarkTheme()) PureBlackThemeSwitch(
                     selected = userSettingsController.pureBlack,
                     onToggle = { userSettingsController.updatePureBlack(it) }
                 )
             }
-
             item {
                 MarqueeSwitch(
                     selected = userSettingsController.disableMarquee,
                     onToggle = { userSettingsController.updateDisableMarquee(it) }
                 )
             }
-
             item {
                 ShowPathSwitch(
                     selected = userSettingsController.showPath,
@@ -86,27 +86,25 @@ fun SettingsScreen(
                 )
             }
 
+            item { SettingsHeadLabel(label = stringResource(id = R.string.provider)) }
             item {
                 TranslationSwitch(
                     selected = userSettingsController.includeTranslation,
                     onToggle = { userSettingsController.updateIncludeTranslation(it) }
                 )
             }
-
             item {
                 MultiPersonSwitch(
                     selected = userSettingsController.multiPersonWordByWord,
                     onToggle = { userSettingsController.updateMultiPersonWordByWord(it) }
                 )
             }
-
             item {
                 SyncedLyricsSwitch(
                     selected = userSettingsController.unsyncedFallbackMusixmatch,
                     onToggle = { userSettingsController.updateUnsyncedFallbackMusixmatch(it) }
                 )
             }
-
             item {
                 OffsetModeSwitch(
                     selected = userSettingsController.directlyModifyTimestamps,
@@ -115,6 +113,7 @@ fun SettingsScreen(
             }
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+                item { SettingsHeadLabel(label = stringResource(R.string.sd_card)) }
                 item {
                     SdCardPathSetting(
                         sdPath = userSettingsController.sdCardPath,
@@ -128,6 +127,7 @@ fun SettingsScreen(
                 }
             }
 
+            item { SettingsHeadLabel(label = stringResource(R.string.about_songsync)) }
             item {
                 AppInfoSection(
                     version = version,
@@ -135,21 +135,24 @@ fun SettingsScreen(
                 )
             }
 
+            item { SettingsHeadLabel(label = stringResource(R.string.source_code)) }
             item {
                 ExternalLinkSection(
-                    label = stringResource(R.string.source_code),
-                    description = stringResource(R.string.view_on_github),
                     url = "https://github.com/Lambada10/SongSync",
                     uriHandler = uriHandler
                 )
             }
 
+            item { SettingsHeadLabel(stringResource(R.string.support)) }
             item { SupportSection(uriHandler = uriHandler) }
 
+            item { SettingsHeadLabel(label = stringResource(id = R.string.translation)) }
             item { TranslationSection(uriHandler = uriHandler) }
 
+            item { SettingsHeadLabel(stringResource(R.string.contributors)) }
             item { ContributorsSection(uriHandler = uriHandler) }
 
+            item { SettingsHeadLabel(label = stringResource(id = R.string.thanks_to)) }
             item { CreditsSection(uriHandler = uriHandler) }
         }
     }
@@ -164,4 +167,4 @@ fun SettingsScreen(
             changelog = updateState.release.changelog ?: ""
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/AppInfoSection.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/AppInfoSection.kt
index 1a7bd08c..a8e7a4a9 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/AppInfoSection.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/AppInfoSection.kt
@@ -1,5 +1,6 @@
 package pl.lambada.songsync.ui.screens.settings.components
 
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
@@ -10,13 +11,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 
 @Composable
 fun AppInfoSection(version: String, onCheckForUpdates: () -> Unit) {
-    SettingsItem(
-        label = stringResource(R.string.about_songsync),
-        modifier = Modifier.padding(horizontal = 22.dp, vertical = 16.dp)
+    Column(
+        modifier = Modifier
+            .padding(horizontal = 22.dp, vertical = 16.dp),
     ) {
         Text(stringResource(R.string.what_is_songsync))
         Text(stringResource(R.string.extra_what_is_songsync))
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ContributorsSection.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ContributorsSection.kt
index 0d5468bc..7b02ebbf 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ContributorsSection.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ContributorsSection.kt
@@ -12,12 +12,10 @@ import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 
 @Composable
 fun ContributorsSection(uriHandler: UriHandler) {
-    SettingsItem(stringResource(R.string.contributors)) {
+    Column{
         Contributor.entries.forEach {
             val additionalInfo = stringResource(id = it.contributionLevel.stringResource)
             Column(
@@ -35,4 +33,4 @@ fun ContributorsSection(uriHandler: UriHandler) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/CreditsSection.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/CreditsSection.kt
index 18945a4e..bb6e33b0 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/CreditsSection.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/CreditsSection.kt
@@ -1,6 +1,7 @@
 package pl.lambada.songsync.ui.screens.settings.components
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -18,12 +19,12 @@ import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
+import pl.lambada.songsync.ui.components.SettingsHeadLabel
 
 
 @Composable
 fun CreditsSection(uriHandler: UriHandler) {
-    SettingsItem(label = stringResource(id = R.string.thanks_to)) {
+    Column{
         val credits = mapOf(
             stringResource(R.string.spotify_api) to "https://developer.spotify.com/documentation/web-api",
             stringResource(R.string.spotifylyrics_api) to "https://github.com/akashrchandran/spotify-lyrics-api",
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ExternalLinkSection.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ExternalLinkSection.kt
index cf2f5649..debdf2fe 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ExternalLinkSection.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ExternalLinkSection.kt
@@ -1,6 +1,7 @@
 package pl.lambada.songsync.ui.screens.settings.components
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -11,22 +12,22 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
+import pl.lambada.songsync.ui.components.SettingsHeadLabel
 
 
 @Composable
-fun ExternalLinkSection(label: String, description: String, url: String, uriHandler: UriHandler) {
-    SettingsItem(
-        label,
+fun ExternalLinkSection(url: String, uriHandler: UriHandler) {
+    Column(
         modifier = Modifier
             .clickable { uriHandler.openUri(url) }
             .padding(horizontal = 22.dp, vertical = 16.dp)
     ) {
         Text(stringResource(R.string.we_are_open_source))
         Text(
-            text = description,
-            color = MaterialTheme.colorScheme.outline,
-            fontSize = 12.sp
+            text = stringResource(R.string.view_on_github),
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MarqueeSwitch.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MarqueeSwitch.kt
index 3e461577..87629e3c 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MarqueeSwitch.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MarqueeSwitch.kt
@@ -3,17 +3,15 @@ package pl.lambada.songsync.ui.screens.settings.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 import pl.lambada.songsync.ui.components.SwitchItem
 
 
 @Composable
 fun MarqueeSwitch(selected: Boolean, onToggle: (Boolean) -> Unit) {
-    SettingsItem(label = stringResource(R.string.disable_marquee)) {
-        SwitchItem(
-            label = stringResource(R.string.disable_marquee_summary),
-            selected = selected,
-            onClick = { onToggle(!selected) }
-        )
-    }
+    SwitchItem(
+        label = stringResource(R.string.disable_marquee),
+        description = stringResource(R.string.disable_marquee_summary),
+        selected = selected,
+        onClick = { onToggle(!selected) }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MultiPersonSwitch.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MultiPersonSwitch.kt
index 75e1ecda..f4276e82 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MultiPersonSwitch.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/MultiPersonSwitch.kt
@@ -3,16 +3,14 @@ package pl.lambada.songsync.ui.screens.settings.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 import pl.lambada.songsync.ui.components.SwitchItem
 
 @Composable
 fun MultiPersonSwitch(selected: Boolean, onToggle: (Boolean) -> Unit) {
-    SettingsItem(label = stringResource(id = R.string.multi_person_word_by_word)) {
-        SwitchItem(
-            label = stringResource(id = R.string.multi_person_word_by_word_summary),
-            selected = selected,
-            onClick = { onToggle(!selected) }
-        )
-    }
+    SwitchItem(
+        label = stringResource(id = R.string.multi_person_word_by_word),
+        description = stringResource(id = R.string.multi_person_word_by_word_summary),
+        selected = selected,
+        onClick = { onToggle(!selected) }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/OffsetModeSwitch.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/OffsetModeSwitch.kt
index 742b8c9c..ac8ba2ee 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/OffsetModeSwitch.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/OffsetModeSwitch.kt
@@ -3,7 +3,6 @@ package pl.lambada.songsync.ui.screens.settings.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 import pl.lambada.songsync.ui.components.SwitchItem
 
 @Composable
@@ -11,11 +10,10 @@ fun OffsetModeSwitch(
     selected: Boolean,
     onToggle: (Boolean) -> Unit
 ) {
-    SettingsItem(label = stringResource(R.string.offset_mode)) {
-        SwitchItem(
-            label = stringResource(R.string.offset_mode_summary),
-            selected = selected,
-            onClick = { onToggle(!selected) }
-        )
-    }
+    SwitchItem(
+        label = stringResource(R.string.offset_mode),
+        description = stringResource(R.string.offset_mode_summary),
+        selected = selected,
+        onClick = { onToggle(!selected) }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/PureBlackThemeSwitch.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/PureBlackThemeSwitch.kt
index ffb053f4..0053d3a6 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/PureBlackThemeSwitch.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/PureBlackThemeSwitch.kt
@@ -3,17 +3,14 @@ package pl.lambada.songsync.ui.screens.settings.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 import pl.lambada.songsync.ui.components.SwitchItem
 
-
 @Composable
 fun PureBlackThemeSwitch(selected: Boolean, onToggle: (Boolean) -> Unit) {
-    SettingsItem(label = stringResource(R.string.theme)) {
-        SwitchItem(
-            label = stringResource(R.string.pure_black_theme),
-            selected = selected,
-            onClick = { onToggle(!selected) }
-        )
-    }
+    SwitchItem(
+        label = stringResource(R.string.pure_black_theme),
+        description = stringResource(R.string.pure_black_theme_summary),
+        selected = selected,
+        onClick = { onToggle(!selected) }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SdCardPathSetting.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SdCardPathSetting.kt
index d44b4ce1..e1f1bc23 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SdCardPathSetting.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SdCardPathSetting.kt
@@ -4,6 +4,7 @@ import android.net.Uri
 import android.os.Environment
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -24,14 +25,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 
 
 @Composable
 fun SdCardPathSetting(sdPath: String?, onClearPath: () -> Unit, onUpdatePath: (String) -> Unit) {
     var picker by remember { mutableStateOf(false) }
-    SettingsItem(
-        label = stringResource(R.string.sd_card),
+    Column(
         modifier = Modifier.padding(horizontal = 22.dp, vertical = 16.dp)
     ) {
         Text(stringResource(R.string.set_sd_path))
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ShowPathSwitch.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ShowPathSwitch.kt
index 91937122..900d600f 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ShowPathSwitch.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/ShowPathSwitch.kt
@@ -3,16 +3,14 @@ package pl.lambada.songsync.ui.screens.settings.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 import pl.lambada.songsync.ui.components.SwitchItem
 
 @Composable
 fun ShowPathSwitch(selected: Boolean, onToggle: (Boolean) -> Unit) {
-    SettingsItem(label = stringResource(R.string.song_path)) {
-        SwitchItem(
-            label = stringResource(R.string.song_path_description),
-            selected = selected,
-            onClick = { onToggle(!selected) }
-        )
-    }
+    SwitchItem(
+        label = stringResource(R.string.song_path),
+        description = stringResource(R.string.song_path_description),
+        selected = selected,
+        onClick = { onToggle(!selected) }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SupportSection.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SupportSection.kt
index 00844062..f3df09c7 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SupportSection.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SupportSection.kt
@@ -12,29 +12,26 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
+import pl.lambada.songsync.ui.components.SettingsHeadLabel
 
 
 @Composable
 fun SupportSection(uriHandler: UriHandler) {
-    SettingsItem(
-        stringResource(R.string.support),
+    Column(
+        modifier = Modifier
+            .clickable { uriHandler.openUri("https://t.me/LambadaOT") }
+            .padding(horizontal = 22.dp, vertical = 16.dp)
     ) {
-        Column(
-            modifier = Modifier
-                .clickable { uriHandler.openUri("https://t.me/LambadaOT") }
-                .padding(horizontal = 22.dp, vertical = 16.dp)
-        ) {
-            Text(stringResource(R.string.bugs_or_suggestions_contact_us))
-            Text(
-                text = stringResource(R.string.telegram_group),
-                color = MaterialTheme.colorScheme.outline,
-                fontSize = 12.sp
-            )
-        }
+        Text(stringResource(R.string.bugs_or_suggestions_contact_us))
         Text(
-            stringResource(R.string.create_issue),
-            modifier = Modifier.padding(horizontal = 22.dp)
+            text = stringResource(R.string.telegram_group),
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
         )
     }
+    Text(
+        stringResource(R.string.create_issue),
+        modifier = Modifier.padding(horizontal = 22.dp)
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SyncedLyricsSwitch.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SyncedLyricsSwitch.kt
index b9546572..4fbc2b6f 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SyncedLyricsSwitch.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/SyncedLyricsSwitch.kt
@@ -3,16 +3,14 @@ package pl.lambada.songsync.ui.screens.settings.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 import pl.lambada.songsync.ui.components.SwitchItem
 
 @Composable
 fun SyncedLyricsSwitch(selected: Boolean, onToggle: (Boolean) -> Unit) {
-    SettingsItem(label = stringResource(id = R.string.synced_lyrics)) {
-        SwitchItem(
-            label = stringResource(id = R.string.synced_lyrics_summary),
-            selected = selected,
-            onClick = { onToggle(!selected) }
-        )
-    }
+    SwitchItem(
+        label = stringResource(id = R.string.synced_lyrics),
+        description = stringResource(id = R.string.synced_lyrics_summary),
+        selected = selected,
+        onClick = { onToggle(!selected) }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSection.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSection.kt
index 057b3138..d1b81874 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSection.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSection.kt
@@ -11,23 +11,22 @@ import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import pl.lambada.songsync.ui.components.SettingsItem
+import pl.lambada.songsync.ui.components.SettingsHeadLabel
 import pl.lambada.songsync.R
 
 @Composable
 fun TranslationSection(uriHandler: UriHandler) {
-    SettingsItem(label = stringResource(id = R.string.translation)) {
-        Column(
-            modifier = Modifier
-                .clickable { uriHandler.openUri("https://hosted.weblate.org/engage/songsync/") }
-                .padding(horizontal = 22.dp, vertical = 16.dp)
-        ) {
-            Text(stringResource(id = R.string.help_us_translate))
-            Text(
-                text = stringResource(id = R.string.translation_website),
-                color = MaterialTheme.colorScheme.outline,
-                fontSize = 12.sp
-            )
-        }
+    Column(
+        modifier = Modifier
+            .clickable { uriHandler.openUri("https://hosted.weblate.org/engage/songsync/") }
+            .padding(horizontal = 22.dp, vertical = 16.dp)
+    ) {
+        Text(stringResource(id = R.string.help_us_translate))
+        Text(
+            text = stringResource(id = R.string.translation_website),
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSwitch.kt b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSwitch.kt
index 6b76b1cf..37ff925a 100644
--- a/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSwitch.kt
+++ b/app/src/main/java/pl/lambada/songsync/ui/screens/settings/components/TranslationSwitch.kt
@@ -3,17 +3,15 @@ package pl.lambada.songsync.ui.screens.settings.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import pl.lambada.songsync.R
-import pl.lambada.songsync.ui.components.SettingsItem
 import pl.lambada.songsync.ui.components.SwitchItem
 
 
 @Composable
 fun TranslationSwitch(selected: Boolean, onToggle: (Boolean) -> Unit) {
-    SettingsItem(label = stringResource(id = R.string.include_translation)) {
-        SwitchItem(
-            label = stringResource(id = R.string.include_translation_summary),
-            selected = selected,
-            onClick = { onToggle(!selected) }
-        )
-    }
-}
\ No newline at end of file
+    SwitchItem(
+        label = stringResource(id = R.string.include_translation),
+        description = stringResource(id = R.string.include_translation_summary),
+        selected = selected,
+        onClick = { onToggle(!selected) }
+    )
+}
diff --git a/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt b/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt
index cbe5d67d..d16f89aa 100644
--- a/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt
+++ b/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt
@@ -368,4 +368,5 @@ fun parseLyrics(lyrics: String): List<Pair<String, String>> {
 
         timestamp to text
     }
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42797952..ad2d33e7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -153,4 +153,5 @@
     <string name="lyrics_subtitle">"Retrieved song lyrics that will be sent to the application "</string>
     <string name="song_name_not_provided">The song name has not been provided</string>
     <string name="unknown_error_occurred">An unknown error occurred</string>
+    <string name="pure_black_theme_summary">Use pure black theme when dark mode is enabled</string>
 </resources>