diff --git a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt b/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt
index c48c3c41..fd442a27 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt
@@ -4,7 +4,13 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.content.ContextCompat
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.VersionUtils
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.util.PreferenceUtil
 
 class AccentIcon @JvmOverloads constructor(
     context: Context,
@@ -12,6 +18,11 @@ class AccentIcon @JvmOverloads constructor(
     defStyleAttr: Int = -1
 ) : AppCompatImageView(context, attrs, defStyleAttr) {
     init {
-        imageTintList = ColorStateList.valueOf(accentColor())
+        val color = if (PreferenceUtil.materialYou && VersionUtils.hasS()) {
+            ContextCompat.getColor(context, R.color.m3_accent_color)
+        } else {
+            ThemeStore.accentColor(context)
+        }
+        imageTintList = ColorStateList.valueOf(color)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_credit.xml b/app/src/main/res/layout/card_credit.xml
index f7900700..13bd142f 100644
--- a/app/src/main/res/layout/card_credit.xml
+++ b/app/src/main/res/layout/card_credit.xml
@@ -21,7 +21,7 @@
             android:paddingEnd="?attr/listPreferredItemPaddingEnd"
             android:paddingBottom="?attr/listPreferredItemPaddingEnd"
             android:text="@string/credit_title"
-            android:textAppearance="@style/TextViewOverline"
+            android:textAppearance="@style/TextViewNormal"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/card_other.xml b/app/src/main/res/layout/card_other.xml
index 2a991b6a..987e4830 100644
--- a/app/src/main/res/layout/card_other.xml
+++ b/app/src/main/res/layout/card_other.xml
@@ -20,7 +20,7 @@
             android:paddingEnd="?attr/listPreferredItemPaddingEnd"
             android:paddingBottom="?attr/listPreferredItemPaddingEnd"
             android:text="@string/others"
-            android:textAppearance="@style/TextViewOverline"
+            android:textAppearance="@style/TextViewNormal"
             android:textColor="?colorAccent"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml
index 1e901866..f5670206 100644
--- a/app/src/main/res/layout/card_retro_info.xml
+++ b/app/src/main/res/layout/card_retro_info.xml
@@ -20,7 +20,7 @@
             android:paddingEnd="?attr/listPreferredItemPaddingEnd"
             android:paddingBottom="?attr/listPreferredItemPaddingEnd"
             android:text="@string/support_development"
-            android:textAppearance="@style/TextViewOverline"
+            android:textAppearance="@style/TextViewNormal"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml
index 7eebc702..0eade5e1 100644
--- a/app/src/main/res/layout/card_social.xml
+++ b/app/src/main/res/layout/card_social.xml
@@ -20,7 +20,7 @@
             android:paddingEnd="?attr/listPreferredItemPaddingEnd"
             android:paddingBottom="?attr/listPreferredItemPaddingEnd"
             android:text="@string/social"
-            android:textAppearance="@style/TextViewOverline"
+            android:textAppearance="@style/TextViewNormal"
             android:textColor="?colorAccent"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"