diff --git a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
index 77d630a95..3aa921695 100644
--- a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
@@ -63,7 +63,7 @@ class LibraryFragment : Fragment() {
         binding.libraryRecycler.apply {
             adapter = libraryAdapter
             setHasFixedSize(true)
-            val spans = context.getSpans()
+            val spans = getSpans()
 
             if (spans != 1) {
                 layoutManager = GridLayoutManager(requireContext(), spans)
diff --git a/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt b/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt
index 066c4999e..0f51c7ff6 100644
--- a/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt
+++ b/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt
@@ -5,7 +5,6 @@ import androidx.annotation.IdRes
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
-import org.oxycblt.auxio.music.BaseModel
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Song
 
diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
index 88120c482..24d2f8872 100644
--- a/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
@@ -83,7 +83,7 @@ class SearchFragment : Fragment() {
 
         binding.searchRecycler.apply {
             adapter = searchAdapter
-            val spans = context.getSpans()
+            val spans = getSpans()
 
             if (spans != -1) {
                 layoutManager = GridLayoutManager(requireContext(), spans).apply {
diff --git a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
index 6b1437ba9..b6510948e 100644
--- a/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
@@ -69,7 +69,7 @@ class SongsFragment : Fragment() {
             adapter = songAdapter
             setHasFixedSize(true)
 
-            val spans = context.getSpans()
+            val spans = getSpans()
 
             if (spans != 1) {
                 layoutManager = GridLayoutManager(requireContext(), spans)
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt b/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
index f199e52db..78dc23587 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/InterfaceUtils.kt
@@ -21,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.logE
@@ -162,7 +163,7 @@ fun isTablet(resources: Resources): Boolean {
 /**
  * Get the span count for most RecyclerViews
  */
-fun Context.getSpans(): Int {
+fun RecyclerView.getSpans(): Int {
     return if (isLandscape(resources)) {
         if (isTablet(resources)) 3 else 2
     } else {
diff --git a/app/src/main/res/layout-land/item_album_header.xml b/app/src/main/res/layout-land/item_album_header.xml
index aa0a09cab..d7b99c758 100644
--- a/app/src/main/res/layout-land/item_album_header.xml
+++ b/app/src/main/res/layout-land/item_album_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_mid_huge"
-            android:layout_height="@dimen/size_cover_mid_huge"
+            android:layout_width="@dimen/size_cover_detail_land"
+            android:layout_height="@dimen/size_cover_detail_land"
             android:layout_marginStart="@dimen/margin_medium"
             android:layout_marginTop="@dimen/margin_medium"
             android:contentDescription="@{@string/description_album_cover(album.name)}"
diff --git a/app/src/main/res/layout-land/item_artist_header.xml b/app/src/main/res/layout-land/item_artist_header.xml
index f586705fa..142f7fbb9 100644
--- a/app/src/main/res/layout-land/item_artist_header.xml
+++ b/app/src/main/res/layout-land/item_artist_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/size_cover_mid_huge"
-            android:layout_height="@dimen/size_cover_mid_huge"
+            android:layout_width="@dimen/size_cover_detail_land"
+            android:layout_height="@dimen/size_cover_detail_land"
             android:layout_margin="@dimen/margin_medium"
             android:contentDescription="@{@string/description_artist_image(artist.name)}"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/layout-land/item_genre_header.xml b/app/src/main/res/layout-land/item_genre_header.xml
index 0717c9fef..895e550c6 100644
--- a/app/src/main/res/layout-land/item_genre_header.xml
+++ b/app/src/main/res/layout-land/item_genre_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/genre_image"
-            android:layout_width="@dimen/size_cover_mid_huge"
-            android:layout_height="@dimen/size_cover_mid_huge"
+            android:layout_width="@dimen/size_cover_detail_land"
+            android:layout_height="@dimen/size_cover_detail_land"
             android:layout_margin="@dimen/margin_medium"
             android:contentDescription="@{@string/description_genre_image(genre.name)}"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/layout-large-port/item_album_header.xml b/app/src/main/res/layout-large/item_album_header.xml
similarity index 97%
rename from app/src/main/res/layout-large-port/item_album_header.xml
rename to app/src/main/res/layout-large/item_album_header.xml
index 7ada8ac50..96ec20a2b 100644
--- a/app/src/main/res/layout-large-port/item_album_header.xml
+++ b/app/src/main/res/layout-large/item_album_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_mid_huge"
-            android:layout_height="@dimen/size_cover_mid_huge"
+            android:layout_width="@dimen/size_cover_detail"
+            android:layout_height="@dimen/size_cover_detail"
             android:layout_marginStart="@dimen/margin_medium"
             android:layout_marginTop="@dimen/margin_medium"
             android:contentDescription="@{@string/description_album_cover(album.name)}"
diff --git a/app/src/main/res/layout-large-port/item_artist_header.xml b/app/src/main/res/layout-large/item_artist_header.xml
similarity index 97%
rename from app/src/main/res/layout-large-port/item_artist_header.xml
rename to app/src/main/res/layout-large/item_artist_header.xml
index f586705fa..80e4e4de1 100644
--- a/app/src/main/res/layout-large-port/item_artist_header.xml
+++ b/app/src/main/res/layout-large/item_artist_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/size_cover_mid_huge"
-            android:layout_height="@dimen/size_cover_mid_huge"
+            android:layout_width="@dimen/size_cover_detail"
+            android:layout_height="@dimen/size_cover_detail"
             android:layout_margin="@dimen/margin_medium"
             android:contentDescription="@{@string/description_artist_image(artist.name)}"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/layout-large-port/item_genre_header.xml b/app/src/main/res/layout-large/item_genre_header.xml
similarity index 97%
rename from app/src/main/res/layout-large-port/item_genre_header.xml
rename to app/src/main/res/layout-large/item_genre_header.xml
index 0717c9fef..0220f6eb2 100644
--- a/app/src/main/res/layout-large-port/item_genre_header.xml
+++ b/app/src/main/res/layout-large/item_genre_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/genre_image"
-            android:layout_width="@dimen/size_cover_mid_huge"
-            android:layout_height="@dimen/size_cover_mid_huge"
+            android:layout_width="@dimen/size_cover_detail"
+            android:layout_height="@dimen/size_cover_detail"
             android:layout_margin="@dimen/margin_medium"
             android:contentDescription="@{@string/description_genre_image(genre.name)}"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/layout/item_album_header.xml b/app/src/main/res/layout/item_album_header.xml
index 4dcff5603..ec5cd2644 100644
--- a/app/src/main/res/layout/item_album_header.xml
+++ b/app/src/main/res/layout/item_album_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_huge"
-            android:layout_height="@dimen/size_cover_huge"
+            android:layout_width="@dimen/size_cover_detail"
+            android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/margin_medium"
             android:contentDescription="@{@string/description_album_cover(album.name)}"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/layout/item_artist_header.xml b/app/src/main/res/layout/item_artist_header.xml
index f3d373aa1..74473016a 100644
--- a/app/src/main/res/layout/item_artist_header.xml
+++ b/app/src/main/res/layout/item_artist_header.xml
@@ -25,8 +25,8 @@
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/size_cover_huge"
-            android:layout_height="@dimen/size_cover_huge"
+            android:layout_width="@dimen/size_cover_detail"
+            android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/margin_medium"
             android:contentDescription="@{@string/description_artist_image(artist.name)}"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/layout/item_genre_header.xml b/app/src/main/res/layout/item_genre_header.xml
index 12d80bd76..b92cece3b 100644
--- a/app/src/main/res/layout/item_genre_header.xml
+++ b/app/src/main/res/layout/item_genre_header.xml
@@ -26,8 +26,8 @@
 
         <ImageView
             android:id="@+id/genre_image"
-            android:layout_width="@dimen/size_cover_huge"
-            android:layout_height="@dimen/size_cover_huge"
+            android:layout_width="@dimen/size_cover_detail"
+            android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/margin_medium"
             android:contentDescription="@{@string/description_genre_image(genre.name)}"
             android:elevation="@dimen/elevation_normal"
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
deleted file mode 100644
index b389fbfc3..000000000
--- a/app/src/main/res/values-large/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="size_cover_mid_huge">200dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0765a9b65..3310b0068 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -31,8 +31,8 @@
     <dimen name="size_cover_compact">44dp</dimen>
     <dimen name="size_cover_normal">56dp</dimen>
     <dimen name="size_cover_large">68dp</dimen>
-    <dimen name="size_cover_mid_huge">130dp</dimen>
-    <dimen name="size_cover_huge">260dp</dimen>
+    <dimen name="size_cover_detail">260dp</dimen>
+    <dimen name="size_cover_detail_land">130dp</dimen>
 
     <dimen name="size_play_pause">70dp</dimen>
     <dimen name="size_play_pause_compact">36dp</dimen>
@@ -46,7 +46,7 @@
     <dimen name="text_size_detail_header_max">26sp</dimen>
     <dimen name="text_size_thumb">18sp</dimen>
     <dimen name="text_size_header">19sp</dimen>
-    <dimen name="text_size_material_button">15sp</dimen>
+    <dimen name="text_size_material_button">16sp</dimen>
     <dimen name="text_size_toolbar_header">20sp</dimen>
 
     <!-- Misc -->