diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 40c79f711..9d956d218 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -72,7 +72,7 @@ class MainFragment : Fragment() {
             itemIconTintList = navTints
             itemTextColor = navTints
 
-            if (isTablet(resources)) {
+            if (isTablet(resources) && !isLandscape(resources)) {
                 labelVisibilityMode = LabelVisibilityMode.LABEL_VISIBILITY_LABELED
             }
         }
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
index e2e91ca2a..bd09b1212 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
@@ -118,15 +118,15 @@ class PlaybackFragment : Fragment(), SeekBar.OnSeekBarChangeListener {
             when (it) {
                 LoopMode.NONE -> {
                     binding.playbackLoop.imageTintList = controlColor
-                    binding.playbackLoop.setImageResource(R.drawable.ic_loop_large)
+                    binding.playbackLoop.setImageResource(R.drawable.ic_loop)
                 }
                 LoopMode.ONCE -> {
                     binding.playbackLoop.imageTintList = accentColor
-                    binding.playbackLoop.setImageResource(R.drawable.ic_loop_one_large)
+                    binding.playbackLoop.setImageResource(R.drawable.ic_loop_one)
                 }
                 LoopMode.INFINITE -> {
                     binding.playbackLoop.imageTintList = accentColor
-                    binding.playbackLoop.setImageResource(R.drawable.ic_loop_large)
+                    binding.playbackLoop.setImageResource(R.drawable.ic_loop)
                 }
 
                 else -> return@observe
diff --git a/app/src/main/res/drawable/ic_loop_large.xml b/app/src/main/res/drawable/ic_loop_large.xml
deleted file mode 100644
index 0a1af5ae3..000000000
--- a/app/src/main/res/drawable/ic_loop_large.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_loop_one_large.xml b/app/src/main/res/drawable/ic_loop_one_large.xml
deleted file mode 100644
index dad42a989..000000000
--- a/app/src/main/res/drawable/ic_loop_one_large.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4zM13,15L13,9h-1l-2,1v1h1.5v4L13,15z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shuffle_large.xml b/app/src/main/res/drawable/ic_shuffle_large.xml
deleted file mode 100644
index b204e09d4..000000000
--- a/app/src/main/res/drawable/ic_shuffle_large.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_next_large.xml b/app/src/main/res/drawable/ic_skip_next_large.xml
deleted file mode 100644
index 82f535b80..000000000
--- a/app/src/main/res/drawable/ic_skip_next_large.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_prev_large.xml b/app/src/main/res/drawable/ic_skip_prev_large.xml
deleted file mode 100644
index 886719760..000000000
--- a/app/src/main/res/drawable/ic_skip_prev_large.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index 177467c74..d011caa37 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -159,17 +159,9 @@
 
         <ImageButton
             android:id="@+id/playback_play_pause"
-            android:layout_width="@dimen/size_play_pause"
-            android:layout_height="@dimen/size_play_pause"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginTop="@dimen/margin_medium"
-            android:layout_marginEnd="@dimen/margin_large"
-            android:background="@drawable/ui_circular_button"
-            android:backgroundTint="?attr/colorPrimary"
+            style="@style/PlayPause"
             android:contentDescription="@{playbackModel.isPlaying ? @string/description_pause : @string/description_play}"
-            android:foregroundTint="@color/background"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
-            android:tint="@color/background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/playback_skip_next"
             app:layout_constraintStart_toEndOf="@+id/playback_skip_prev"
@@ -178,14 +170,13 @@
 
         <ImageButton
             android:id="@+id/playback_skip_next"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
+            style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/margin_large"
+            android:padding="0dp"
             android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@string/description_skip_next"
             android:onClick="@{() -> playbackModel.skipNext()}"
-            android:src="@drawable/ic_skip_next_large"
+            android:src="@drawable/ic_skip_next"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
             app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
             app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
@@ -193,14 +184,13 @@
 
         <ImageButton
             android:id="@+id/playback_skip_prev"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
+            style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/margin_large"
             android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@string/description_skip_prev"
             android:onClick="@{() -> playbackModel.skipPrev()}"
-            android:src="@drawable/ic_skip_prev_large"
+            android:src="@drawable/ic_skip_prev"
+            android:padding="0dp"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
             app:layout_constraintStart_toEndOf="@+id/playback_loop"
@@ -208,13 +198,11 @@
 
         <ImageButton
             android:id="@+id/playback_shuffle"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
+            style="@style/Widget.Button.Unbounded"
             android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@{playbackModel.isShuffling() ? @string/description_shuffle_off : @string/description_shuffle_on"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
-            android:src="@drawable/ic_shuffle_large"
+            android:src="@drawable/ic_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_container_duration"
             app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
@@ -222,13 +210,10 @@
 
         <ImageButton
             android:id="@+id/playback_loop"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
-            android:background="@drawable/ui_unbounded_ripple"
+            style="@style/Widget.Button.Unbounded"
             android:contentDescription="@string/description_change_loop"
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
-            android:src="@drawable/ic_loop_large"
+            android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
             app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
             app:layout_constraintHorizontal_chainStyle="packed"
diff --git a/app/src/main/res/layout-large-land/fragment_playback.xml b/app/src/main/res/layout-large-land/fragment_playback.xml
index c01c418e1..88603e3e9 100644
--- a/app/src/main/res/layout-large-land/fragment_playback.xml
+++ b/app/src/main/res/layout-large-land/fragment_playback.xml
@@ -161,17 +161,9 @@
 
         <ImageButton
             android:id="@+id/playback_play_pause"
-            android:layout_width="@dimen/size_play_pause"
-            android:layout_height="@dimen/size_play_pause"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginTop="@dimen/margin_medium"
-            android:layout_marginEnd="@dimen/margin_large"
-            android:background="@drawable/ui_circular_button"
-            android:backgroundTint="?attr/colorPrimary"
+            style="@style/PlayPause"
             android:contentDescription="@{playbackModel.isPlaying ? @string/description_pause : @string/description_play}"
-            android:foregroundTint="@color/background"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
-            android:tint="@color/background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/playback_skip_next"
             app:layout_constraintStart_toEndOf="@+id/playback_skip_prev"
@@ -180,14 +172,15 @@
 
         <ImageButton
             android:id="@+id/playback_skip_next"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.Button.Unbounded"
             android:layout_width="@dimen/size_play_pause_compact"
             android:layout_height="@dimen/size_play_pause_compact"
             android:layout_marginEnd="@dimen/margin_large"
             android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@string/description_skip_next"
             android:onClick="@{() -> playbackModel.skipNext()}"
-            android:src="@drawable/ic_skip_next_large"
+            android:src="@drawable/ic_skip_next"
+            android:padding="0dp"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
             app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
             app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
@@ -195,14 +188,14 @@
 
         <ImageButton
             android:id="@+id/playback_skip_prev"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.Button.Unbounded"
             android:layout_width="@dimen/size_play_pause_compact"
             android:layout_height="@dimen/size_play_pause_compact"
             android:layout_marginStart="@dimen/margin_large"
             android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@string/description_skip_prev"
             android:onClick="@{() -> playbackModel.skipPrev()}"
-            android:src="@drawable/ic_skip_prev_large"
+            android:src="@drawable/ic_skip_prev"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
             app:layout_constraintStart_toEndOf="@+id/playback_loop"
@@ -210,13 +203,14 @@
 
         <ImageButton
             android:id="@+id/playback_shuffle"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.Button.Unbounded"
             android:layout_width="@dimen/size_play_pause_compact"
             android:layout_height="@dimen/size_play_pause_compact"
             android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@{playbackModel.isShuffling() ? @string/description_shuffle_off : @string/description_shuffle_on"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
-            android:src="@drawable/ic_shuffle_large"
+            android:src="@drawable/ic_shuffle"
+            android:padding="0dp"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_container_duration"
             app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
@@ -224,13 +218,13 @@
 
         <ImageButton
             android:id="@+id/playback_loop"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.Button.Unbounded"
             android:layout_width="@dimen/size_play_pause_compact"
             android:layout_height="@dimen/size_play_pause_compact"
             android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@string/description_change_loop"
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
-            android:src="@drawable/ic_loop_large"
+            android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
             app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
             app:layout_constraintHorizontal_chainStyle="packed"
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 859181fad..61f87d680 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -148,17 +148,10 @@
 
         <ImageButton
             android:id="@+id/playback_play_pause"
-            android:layout_width="@dimen/size_play_pause"
-            android:layout_height="@dimen/size_play_pause"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginEnd="@dimen/margin_large"
+            style="@style/PlayPause"
             android:layout_marginBottom="@dimen/margin_medium"
-            android:background="@drawable/ui_circular_button"
-            android:backgroundTint="?attr/colorPrimary"
             android:contentDescription="@{playbackModel.isPlaying ? @string/description_pause : @string/description_play}"
-            android:foregroundTint="@color/background"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
-            android:tint="@color/background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/playback_skip_next"
             app:layout_constraintStart_toEndOf="@+id/playback_skip_prev"
@@ -166,14 +159,11 @@
 
         <ImageButton
             android:id="@+id/playback_skip_next"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
+            style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/margin_large"
-            android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@string/description_skip_next"
             android:onClick="@{() -> playbackModel.skipNext()}"
-            android:src="@drawable/ic_skip_next_large"
+            android:src="@drawable/ic_skip_next"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
             app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
             app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
@@ -181,14 +171,12 @@
 
         <ImageButton
             android:id="@+id/playback_skip_prev"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
+            style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/margin_large"
-            android:background="@drawable/ui_unbounded_ripple"
             android:contentDescription="@string/description_skip_prev"
             android:onClick="@{() -> playbackModel.skipPrev()}"
-            android:src="@drawable/ic_skip_prev_large"
+            android:padding="0dp"
+            android:src="@drawable/ic_skip_prev"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
             app:layout_constraintStart_toEndOf="@+id/playback_loop"
@@ -196,13 +184,11 @@
 
         <ImageButton
             android:id="@+id/playback_shuffle"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
-            android:background="@drawable/ui_unbounded_ripple"
+            style="@style/Widget.Button.Unbounded"
             android:contentDescription="@{playbackModel.isShuffling() ? @string/description_shuffle_off : @string/description_shuffle_on"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
-            android:src="@drawable/ic_shuffle_large"
+            android:src="@drawable/ic_shuffle"
+            android:padding="0dp"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
@@ -210,13 +196,10 @@
 
         <ImageButton
             android:id="@+id/playback_loop"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="@dimen/size_play_pause_compact"
-            android:layout_height="@dimen/size_play_pause_compact"
-            android:background="@drawable/ui_unbounded_ripple"
+            style="@style/Widget.Button.Unbounded"
             android:contentDescription="@string/description_change_loop"
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
-            android:src="@drawable/ic_loop_large"
+            android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
             app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
             app:layout_constraintHorizontal_chainStyle="packed"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9ae85cd1c..3eb0c6710 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Padding Namespace | Dimens for padding attributes -->
+    <dimen name="padding_microscopic">2dp</dimen>
     <dimen name="padding_tiny">4dp</dimen>
     <dimen name="padding_small">8dp</dimen>
     <dimen name="padding_medium">16dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 613448633..2f9b1a392 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -214,4 +214,27 @@
         <item name="android:textColor">@color/background</item>
         <item name="cornerRadius">0dp</item>
     </style>
+
+    <!-- Style for an unbounded button -->
+    <style name="Widget.Button.Unbounded" parent="Widget.AppCompat.Button.Borderless">
+        <item name="android:layout_width">@dimen/size_play_pause_compact</item>
+        <item name="android:layout_height">@dimen/size_play_pause_compact</item>
+        <item name="android:background">@drawable/ui_unbounded_ripple</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:padding">@dimen/padding_microscopic</item>
+    </style>
+
+    <!-- Style for the play/pause circle button -->
+    <style name="PlayPause">
+        <item name="android:layout_height">@dimen/size_play_pause</item>
+        <item name="android:layout_width">@dimen/size_play_pause</item>
+        <item name="android:background">@drawable/ui_circular_button</item>
+        <item name="android:backgroundTint">?attr/colorPrimary</item>
+        <item name="android:tint">?android:attr/windowBackground</item>
+        <item name="android:layout_marginStart">@dimen/margin_large</item>
+        <item name="android:layout_marginTop">@dimen/margin_medium</item>
+        <item name="android:layout_marginEnd">@dimen/margin_large</item>
+        <item name="android:scaleType">fitCenter</item>
+        <item name="android:padding">@dimen/padding_medium</item>
+    </style>
 </resources>
\ No newline at end of file