diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index bcaf381c7..d04b4e987 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -66,7 +66,7 @@
             app:srcCompat="@drawable/ic_access_time_white_24dp" />
 
         <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingTop="8dp"
@@ -94,7 +94,7 @@
             app:srcCompat="@drawable/ic_library_add_white_24dp" />
 
         <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingTop="8dp"
@@ -123,7 +123,7 @@
             app:srcCompat="@drawable/ic_trending_up_white_24dp" />
 
         <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingTop="8dp"
@@ -151,7 +151,7 @@
             app:srcCompat="@drawable/ic_shuffle_white_24dp" />
 
         <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
index d10f3e22f..eb9d70491 100644
--- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
+++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
@@ -51,6 +51,7 @@
         android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
         android:singleLine="true"
         android:textAppearance="@style/TextViewNormal"
+        android:textColor="?colorOnSurface"
         android:textSize="@dimen/md_listitem_textsize"
         tools:text="Item" />