diff --git a/app/sampledata/covers/Forget-me-not Volume 1.jpg b/app/sampledata/covers/Forget-me-not Volume 1.jpg
deleted file mode 100644
index f5bbc36e5..000000000
Binary files a/app/sampledata/covers/Forget-me-not Volume 1.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Forget-me-not Volume 2.jpg b/app/sampledata/covers/Forget-me-not Volume 2.jpg
deleted file mode 100644
index fea5eaaba..000000000
Binary files a/app/sampledata/covers/Forget-me-not Volume 2.jpg and /dev/null differ
diff --git a/app/sampledata/covers/La Pomme Prisoinniere.jpg b/app/sampledata/covers/La Pomme Prisoinniere.jpg
deleted file mode 100644
index f82af29a7..000000000
Binary files a/app/sampledata/covers/La Pomme Prisoinniere.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Momo Kanchou no Himitsu Kichi.jpg b/app/sampledata/covers/Momo Kanchou no Himitsu Kichi.jpg
deleted file mode 100644
index 6a5207cf7..000000000
Binary files a/app/sampledata/covers/Momo Kanchou no Himitsu Kichi.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Omoide Emanon.jpg b/app/sampledata/covers/Omoide Emanon.jpg
deleted file mode 100644
index b078f670a..000000000
Binary files a/app/sampledata/covers/Omoide Emanon.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Sasurai Emanon Volume 1.jpg b/app/sampledata/covers/Sasurai Emanon Volume 1.jpg
deleted file mode 100644
index 4a185e835..000000000
Binary files a/app/sampledata/covers/Sasurai Emanon Volume 1.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Sasurai Emanon Volume 2.jpg b/app/sampledata/covers/Sasurai Emanon Volume 2.jpg
deleted file mode 100644
index f7f745f23..000000000
Binary files a/app/sampledata/covers/Sasurai Emanon Volume 2.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Sasurai Emanon Volume 3.jpg b/app/sampledata/covers/Sasurai Emanon Volume 3.jpg
deleted file mode 100644
index 714538ff8..000000000
Binary files a/app/sampledata/covers/Sasurai Emanon Volume 3.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Wandering Island Volume 1.jpg b/app/sampledata/covers/Wandering Island Volume 1.jpg
deleted file mode 100644
index 2d6edccee..000000000
Binary files a/app/sampledata/covers/Wandering Island Volume 1.jpg and /dev/null differ
diff --git a/app/sampledata/covers/Wandering Island Volume 2.jpg b/app/sampledata/covers/Wandering Island Volume 2.jpg
deleted file mode 100644
index 52e1e5562..000000000
Binary files a/app/sampledata/covers/Wandering Island Volume 2.jpg and /dev/null differ
diff --git a/app/sampledata/genres b/app/sampledata/genres
deleted file mode 100644
index 017d3ee73..000000000
--- a/app/sampledata/genres
+++ /dev/null
@@ -1,10 +0,0 @@
-Slice of Life, Mystery
-Slice of Life, Mystery
-Psychological, Romance, Comedy, Slice of Life, Supernatural
-Sci-Fi, Comedy
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Reincarnation, Sci-Fi, Historical, Psychological, Drama, Slice of Life, Supernatural, Mystery
-Adventure, Slice of Life, Mystery
-Adventure, Slice of Life, Mystery
diff --git a/app/sampledata/titles b/app/sampledata/titles
deleted file mode 100644
index 9bdeb7594..000000000
--- a/app/sampledata/titles
+++ /dev/null
@@ -1,10 +0,0 @@
-Forget-me-not Vol. 1
-Forget-me-not Vol. 2
-La Pomme Prisoinniere
-Momo Kanchou no Himitsu Kichi
-Omoide Emanon
-Sasurai Emanon Vol. 1
-Sasurai Emanon Vol. 2
-Sasurai Emanon Vol. 3
-Wandering Island Vol. 1
-Wandering Island Vol. 2
diff --git a/app/src/main/res/layout/activity_color_filter.xml b/app/src/main/res/layout/activity_color_filter.xml
index 0d198d9d6..f11930675 100644
--- a/app/src/main/res/layout/activity_color_filter.xml
+++ b/app/src/main/res/layout/activity_color_filter.xml
@@ -51,7 +51,7 @@
app:shapeAppearance="?shapeAppearanceCornerLarge"
app:strokeColor="?colorOutline"
app:strokeWidth="1dp"
- tools:src="@sample/covers" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/backgrounds/scenic[5]" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
+ tools:src="@tools:sample/backgrounds/scenic[5]" />
+ tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/item_manga_list.xml b/app/src/main/res/layout/item_manga_list.xml
index 668b163c8..14309a582 100644
--- a/app/src/main/res/layout/item_manga_list.xml
+++ b/app/src/main/res/layout/item_manga_list.xml
@@ -18,7 +18,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
- tools:src="@sample/covers" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
+ tools:text="@tools:sample/lorem/random" />
diff --git a/app/src/main/res/layout/item_manga_list_details.xml b/app/src/main/res/layout/item_manga_list_details.xml
index ab20434bc..7e1472cdc 100644
--- a/app/src/main/res/layout/item_manga_list_details.xml
+++ b/app/src/main/res/layout/item_manga_list_details.xml
@@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
- tools:src="@sample/covers" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
+ tools:src="@tools:sample/backgrounds/scenic[7]" />
+ tools:text="@tools:sample/lorem" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/item_shelf.xml b/app/src/main/res/layout/item_shelf.xml
index 4d5d9d2bb..b7d427b8b 100644
--- a/app/src/main/res/layout/item_shelf.xml
+++ b/app/src/main/res/layout/item_shelf.xml
@@ -24,7 +24,7 @@
android:layout_height="@dimen/widget_cover_height"
android:scaleType="centerCrop"
tools:ignore="ContentDescription"
- tools:src="@sample/covers" />
+ tools:src="@tools:sample/backgrounds/scenic" />
+ tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/sheet_scrobbling.xml b/app/src/main/res/layout/sheet_scrobbling.xml
index a79e7ba7d..9fc20a6d0 100644
--- a/app/src/main/res/layout/sheet_scrobbling.xml
+++ b/app/src/main/res/layout/sheet_scrobbling.xml
@@ -33,7 +33,7 @@
app:layout_constraintTop_toBottomOf="@id/dragHandle"
app:layout_constraintWidth_percent="0.3"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
- tools:background="@sample/covers[9]"
+ tools:background="@tools:sample/backgrounds/scenic"
tools:ignore="ContentDescription,UnusedAttribute" />
+ tools:text="@tools:sample/backgrounds/scenic[9]" />