diff --git a/app/src/main/res/layout-xlarge/item_artist.xml b/app/src/main/res/layout-xlarge/item_artist.xml
index 13b057c4c..da64d842c 100644
--- a/app/src/main/res/layout-xlarge/item_artist.xml
+++ b/app/src/main/res/layout-xlarge/item_artist.xml
@@ -26,9 +26,8 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:gravity="center"
-        android:maxLines="1"
+        android:maxLines="2"
         android:paddingTop="12dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?attr/colorOnPrimary"
-        tools:text="Name" />
+        tools:text="@tools:sample/full_names" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index 63ae35a5e..122af633e 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -17,9 +17,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="4dp"
             app:cardCornerRadius="8dp"
-            app:cardElevation="0dp"
-            app:cardUseCompatPadding="true"
-            app:strokeWidth="1.5dp">
+            app:cardUseCompatPadding="true">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_album_card.xml b/app/src/main/res/layout/item_album_card.xml
index 537ee4b4f..48245a3d4 100644
--- a/app/src/main/res/layout/item_album_card.xml
+++ b/app/src/main/res/layout/item_album_card.xml
@@ -27,12 +27,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:ellipsize="end"
-        android:maxLines="1"
+        android:maxLines="2"
         android:paddingStart="12dp"
         android:paddingEnd="8dp"
         android:paddingBottom="4dp"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorPrimary"
         tools:ignore="MissingPrefix"
         tools:text="My top tracks" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index 94ad88767..d55de701d 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -26,8 +26,7 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:gravity="center"
-        android:maxLines="1"
+        android:maxLines="2"
         android:paddingTop="12dp"
-        android:textColor="?android:attr/textColorPrimary"
-        tools:text="Name" />
+        tools:text="@tools:sample/full_names" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
index cb5fb3ab5..2414408aa 100644
--- a/app/src/main/res/layout/item_contributor.xml
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -48,7 +48,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@+id/icon"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/full_names" />
 
     <code.name.monkey.retromusic.views.BaselineGridTextView
         android:id="@+id/text"
@@ -62,6 +62,6 @@
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/icon"
         app:lineHeightHint="24sp"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/full_names" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contributor_header.xml b/app/src/main/res/layout/item_contributor_header.xml
index c68d2d02b..188392564 100644
--- a/app/src/main/res/layout/item_contributor_header.xml
+++ b/app/src/main/res/layout/item_contributor_header.xml
@@ -58,6 +58,6 @@
             android:layout_height="wrap_content"
             android:textColor="?android:attr/textColorSecondary"
             app:lineHeightHint="24sp"
-            tools:text="@tools:sample/lorem/random" />
+            tools:text="@tools:sample/full_names" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml
index 26860dfde..8e061e316 100644
--- a/app/src/main/res/layout/item_donation_option.xml
+++ b/app/src/main/res/layout/item_donation_option.xml
@@ -48,14 +48,14 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:textAppearance="@style/TextViewBody2"
-                tools:text="Title" />
+                tools:text="@tools:sample/full_names" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/itemText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextViewBody1"
-                tools:text="description" />
+                tools:text="@tools:sample/full_names" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml
index 21cfaa2aa..7048fafad 100644
--- a/app/src/main/res/layout/item_grid_circle.xml
+++ b/app/src/main/res/layout/item_grid_circle.xml
@@ -46,11 +46,12 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:gravity="center"
+                android:maxLines="2"
                 android:textAppearance="@style/TextViewSubtitle1"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textStyle="bold"
-                tools:text="@tools:sample/lorem" />
+                tools:text="@tools:sample/lorem/random" />
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text"
diff --git a/app/src/main/res/layout/list_item_view.xml b/app/src/main/res/layout/list_item_view.xml
index 454563c60..7393159ef 100644
--- a/app/src/main/res/layout/list_item_view.xml
+++ b/app/src/main/res/layout/list_item_view.xml
@@ -50,12 +50,13 @@
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
-        app:lineHeightHint="24sp"
-        android:textColor="?android:attr/textColorSecondary"
+        app:lineHeightHint="20sp"
         tools:maxLines="2"
         tools:text="@tools:sample/lorem/random" />
 
diff --git a/app/src/main/res/layout/list_item_view_seekbar.xml b/app/src/main/res/layout/list_item_view_seekbar.xml
index 25864d96a..9cdebdfb2 100644
--- a/app/src/main/res/layout/list_item_view_seekbar.xml
+++ b/app/src/main/res/layout/list_item_view_seekbar.xml
@@ -50,12 +50,13 @@
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
-        app:lineHeightHint="24sp"
+        app:lineHeightHint="20sp"
         tools:maxLines="2"
         tools:text="@tools:sample/lorem/random" />
 
diff --git a/app/src/main/res/layout/list_item_view_switch.xml b/app/src/main/res/layout/list_item_view_switch.xml
index 2b3383742..00569b275 100644
--- a/app/src/main/res/layout/list_item_view_switch.xml
+++ b/app/src/main/res/layout/list_item_view_switch.xml
@@ -50,6 +50,7 @@
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
         android:paddingStart="0dp"
         android:paddingEnd="16dp"
         android:textColor="?android:attr/textColorSecondary"
@@ -57,7 +58,7 @@
         app:layout_constraintEnd_toStartOf="@android:id/checkbox"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
-        app:lineHeightHint="24sp"
+        app:lineHeightHint="20sp"
         tools:maxLines="2"
         tools:text="@tools:sample/lorem/random" />