diff --git a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
index 37bba7918..4e2eb89da 100644
--- a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
@@ -141,10 +141,9 @@ class LoadingFragment : Fragment() {
      */
     private fun showLoading(binding: FragmentLoadingBinding) {
         binding.apply {
-            loadingErrorIcon.visibility = View.GONE
-            loadingErrorText.visibility = View.GONE
-            loadingRetryButton.visibility = View.GONE
-            loadingGrantButton.visibility = View.GONE
+            loadingErrorIcon.visibility = View.INVISIBLE
+            loadingErrorText.visibility = View.INVISIBLE
+            loadingActionButton.visibility = View.INVISIBLE
             loadingCircle.visibility = View.VISIBLE
         }
     }
@@ -158,21 +157,37 @@ class LoadingFragment : Fragment() {
         binding.loadingCircle.visibility = View.GONE
         binding.loadingErrorIcon.visibility = View.VISIBLE
         binding.loadingErrorText.visibility = View.VISIBLE
+        binding.loadingActionButton.visibility = View.VISIBLE
 
         when (error) {
             MusicStore.Response.NO_MUSIC -> {
-                binding.loadingRetryButton.visibility = View.VISIBLE
                 binding.loadingErrorText.text = getString(R.string.err_no_music)
-            }
-
-            MusicStore.Response.NO_PERMS -> {
-                binding.loadingGrantButton.visibility = View.VISIBLE
-                binding.loadingErrorText.text = getString(R.string.err_no_perms)
+                binding.loadingActionButton.apply {
+                    setText(R.string.lbl_retry)
+                    setOnClickListener {
+                        loadingModel.load(context)
+                    }
+                }
             }
 
             MusicStore.Response.FAILED -> {
-                binding.loadingRetryButton.visibility = View.VISIBLE
                 binding.loadingErrorText.text = getString(R.string.err_load_failed)
+                binding.loadingActionButton.apply {
+                    setText(R.string.lbl_retry)
+                    setOnClickListener {
+                        loadingModel.load(context)
+                    }
+                }
+            }
+
+            MusicStore.Response.NO_PERMS -> {
+                binding.loadingErrorText.text = getString(R.string.err_no_perms)
+                binding.loadingActionButton.apply {
+                    setText(R.string.lbl_grant)
+                    setOnClickListener {
+                        loadingModel.grant()
+                    }
+                }
             }
 
             else -> {}
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 0ec9cc8dc..24032b656 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
@@ -9,61 +10,80 @@
             type="org.oxycblt.auxio.loading.LoadingViewModel" />
     </data>
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:animateLayoutChanges="true"
         android:gravity="center"
-        android:orientation="vertical"
-        android:padding="@dimen/spacing_small">
+        android:orientation="vertical">
 
-        <ProgressBar
-            android:id="@+id/loading_circle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/spacing_small"
-            android:paddingBottom="@dimen/spacing_tiny" />
+        <!-- TODO: Get this splash icon working with Android 12 splashes -->
 
         <ImageView
-            android:id="@+id/loading_error_icon"
-            android:layout_width="@dimen/size_error_icon"
-            android:layout_height="@dimen/size_error_icon"
-            android:layout_margin="@dimen/spacing_small"
-            android:contentDescription="@string/desc_error"
-            android:src="@drawable/ic_error"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:id="@+id/loading_splash"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/desc_auxio_icon"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_launcher_foreground" />
 
-        <TextView
-            android:id="@+id/loading_error_text"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/inter"
-            android:textAlignment="center"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:text="Some kind of error" />
+            android:layout_margin="@dimen/spacing_large"
+            android:animateLayoutChanges="true"
+            android:layout_gravity="bottom"
+            android:fitsSystemWindows="true"
+            android:gravity="center"
+            android:orientation="vertical">
 
-        <Button
-            android:id="@+id/loading_retry_button"
-            style="@style/Widget.Button.Unbounded.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="@{() -> loadingModel.load(context)}"
-            android:text="@string/lbl_retry"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/loading_circle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                app:layout_constraintBottom_toBottomOf="@+id/loading_action_button"
+                app:layout_constraintTop_toTopOf="@+id/loading_error_icon" />
 
-        <Button
-            android:id="@+id/loading_grant_button"
-            style="@style/Widget.Button.Unbounded.Text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:onClick="@{() -> loadingModel.grant()}"
-            android:text="@string/lbl_grant"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            <TextView
+                android:id="@+id/loading_error_text"
+                android:fontFamily="@font/inter_semibold"
+                android:textSize="@dimen/text_size_mid_large"
+                android:textColor="?android:attr/textColorPrimary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/spacing_small"
+                android:textAlignment="center"
+                app:layout_constraintBottom_toTopOf="@+id/loading_action_button"
+                tools:text="No Music Found" />
 
-    </LinearLayout>
+            <ImageView
+                android:id="@+id/loading_error_icon"
+                android:layout_width="@dimen/size_error_icon"
+                android:layout_height="@dimen/size_error_icon"
+                android:layout_marginBottom="@dimen/spacing_small"
+                android:contentDescription="@string/desc_error"
+                android:src="@drawable/ic_error"
+                android:visibility="gone"
+                app:layout_constraintBottom_toTopOf="@+id/loading_error_text"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:visibility="visible" />
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loading_action_button"
+                style="@style/Widget.Button.Vibrant.Primary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/spacing_mid_large"
+                android:layout_marginEnd="@dimen/spacing_mid_large"
+                android:text="@string/lbl_retry"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:visibility="visible" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_artist_header.xml b/app/src/main/res/layout/item_artist_header.xml
index ff3d5b29a..3924c961d 100644
--- a/app/src/main/res/layout/item_artist_header.xml
+++ b/app/src/main/res/layout/item_artist_header.xml
@@ -103,7 +103,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_small"
             android:background="@drawable/ui_header_dividers"
-            android:text="@string/lbl_songs"
+            android:text="@string/lbl_albums"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/artist_play_button" />
diff --git a/app/src/main/res/layout/view_fast_scroll.xml b/app/src/main/res/layout/view_fast_scroll.xml
index 9af8f522e..e78e460f9 100644
--- a/app/src/main/res/layout/view_fast_scroll.xml
+++ b/app/src/main/res/layout/view_fast_scroll.xml
@@ -25,7 +25,7 @@
                 android:fontFamily="@font/inter_semibold"
                 android:gravity="center"
                 android:textColor="?android:attr/windowBackground"
-                android:textSize="@dimen/text_size_thumb"
+                android:textSize="@dimen/text_size_mid_large"
                 tools:text="A" />
 
         </FrameLayout>
diff --git a/app/src/main/res/values-large/styles_ui.xml b/app/src/main/res/values-large/styles_ui.xml
deleted file mode 100644
index baa48dc0e..000000000
--- a/app/src/main/res/values-large/styles_ui.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Widget.Button.Vibrant.Base" parent="@style/Widget.MaterialComponents.Button.TextButton">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:clickable">true</item>
-        <item name="android:focusable">true</item>
-        <item name="rippleColor">?attr/colorControlHighlight</item>
-        <item name="fontFamily">@font/inter_semibold</item>
-        <item name="textAllCaps">false</item>
-        <item name="cornerRadius">0dp</item>
-        <item name="android:padding">@dimen/spacing_small</item>
-        <item name="android:textSize">@dimen/text_size_material_button</item>
-    </style>
-</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 a678608c3..a6f1393ae 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -39,14 +39,13 @@
     <dimen name="size_app_icon">50dp</dimen>
 
     <!-- Text Size Namespace | Text Sizes -->
-    <dimen name="text_size_min">10sp</dimen>
     <dimen name="text_size_increment">1sp</dimen>
+    <dimen name="text_size_min">10sp</dimen>
     <dimen name="text_size_track_max">20sp</dimen>
     <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">16sp</dimen>
-    <dimen name="text_size_toolbar_header">20sp</dimen>
+    <dimen name="text_size_small">16sp</dimen>
+    <dimen name="text_size_mid_large">18sp</dimen>
+    <dimen name="text_size_toolbar">20sp</dimen>
 
     <!-- Misc -->
     <dimen name="elevation_small">2dp</dimen>
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index 245b5162e..9ca6a2ab4 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -54,7 +54,7 @@
     <style name="Widget.TextView.Dialog.Title" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
         <item name="android:fontFamily">@font/inter_bold</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">@dimen/text_size_toolbar_header</item>
+        <item name="android:textSize">@dimen/text_size_toolbar</item>
     </style>
 
     <!-- The style for the checked text view in the custom dialog -->
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 8781cd926..0346be789 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -70,7 +70,7 @@
 
     <style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:fontFamily">@font/inter_bold</item>
-        <item name="android:textSize">@dimen/text_size_toolbar_header</item>
+        <item name="android:textSize">@dimen/text_size_toolbar</item>
     </style>
 
     <style name="ItemLayout">
@@ -146,7 +146,7 @@
         <item name="android:paddingTop">@dimen/spacing_small</item>
         <item name="android:paddingBottom">@dimen/spacing_small</item>
         <item name="android:paddingEnd">@dimen/spacing_medium</item>
-        <item name="android:textSize">@dimen/text_size_header</item>
+        <item name="android:textSize">@dimen/text_size_mid_large</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:background">@drawable/ui_header_dividers</item>
@@ -194,11 +194,6 @@
         <item name="android:padding">@dimen/spacing_micro</item>
     </style>
 
-    <style name="Widget.Button.Unbounded.Text" parent="Widget.AppCompat.Button.Borderless.Colored">
-        <item name="android:fontFamily">@font/inter_semibold</item>
-        <item name="android:textColor">?attr/colorAccent</item>
-    </style>
-
     <style name="Widget.Button.Unbounded.Small" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:minWidth">0dp</item>
         <item name="android:minHeight">0dp</item>
@@ -216,12 +211,14 @@
         <item name="android:focusable">true</item>
         <item name="rippleColor">?attr/colorControlHighlight</item>
         <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
         <item name="textAllCaps">false</item>
         <item name="cornerRadius">0dp</item>
     </style>
 
     <style name="Widget.Button.Vibrant.Primary" parent="@style/Widget.Button.Vibrant.Base">
         <item name="android:textColor">?attr/colorSurface</item>
+        <item name="backgroundTint">?attr/colorAccent</item>
     </style>
 
     <style name="Widget.Button.Vibrant.Secondary" parent="@style/Widget.Button.Vibrant.Base">