diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2483c375..28e1e57ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     - Search and library now show playing indicators
     - Playing indicators are now animated when playback is ongoing
 - Added smooth seeking
+- Moved the "more" button in the playback view back to the top
 
 #### What's Fixed
 - Fixed issue where fast scroller popup would not appear
diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt
index 76eaaeb91..5d3154333 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt
@@ -94,14 +94,13 @@ class HomeViewModel(application: Application) :
     }
 
     /** Get the specific sort for the given [DisplayMode]. */
-    fun getSortForDisplay(displayMode: DisplayMode): Sort {
-        return when (displayMode) {
+    fun getSortForDisplay(displayMode: DisplayMode) =
+        when (displayMode) {
             DisplayMode.SHOW_SONGS -> settings.libSongSort
             DisplayMode.SHOW_ALBUMS -> settings.libAlbumSort
             DisplayMode.SHOW_ARTISTS -> settings.libArtistSort
             DisplayMode.SHOW_GENRES -> settings.libGenreSort
         }
-    }
 
     /** Update the currently displayed item's [Sort]. */
     fun updateCurrentSort(sort: Sort) {
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
index 44dd683c0..6be4243b3 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
@@ -40,7 +40,7 @@ import org.oxycblt.auxio.util.secsToMs
 
 /**
  * A [HomeListFragment] for showing a list of [Album]s.
- * @author
+ * @author OxygenCobalt
  */
 class AlbumListFragment : HomeListFragment<Album>() {
     private val homeAdapter = AlbumAdapter(this)
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
index 0085cc40e..4c5a77945 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
@@ -37,7 +37,7 @@ import org.oxycblt.auxio.util.formatDurationMs
 
 /**
  * A [HomeListFragment] for showing a list of [Artist]s.
- * @author
+ * @author OxygenCobalt
  */
 class ArtistListFragment : HomeListFragment<Artist>() {
     private val homeAdapter = ArtistAdapter(this)
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
index a296d12c9..c51c1ab3a 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
@@ -37,7 +37,7 @@ import org.oxycblt.auxio.util.formatDurationMs
 
 /**
  * A [HomeListFragment] for showing a list of [Genre]s.
- * @author
+ * @author OxygenCobalt
  */
 class GenreListFragment : HomeListFragment<Genre>() {
     private val homeAdapter = GenreAdapter(this)
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
index f2e44e73c..37f0f3a72 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
@@ -41,7 +41,7 @@ import org.oxycblt.auxio.util.secsToMs
 
 /**
  * A [HomeListFragment] for showing a list of [Song]s.
- * @author
+ * @author OxygenCobalt
  */
 class SongListFragment : HomeListFragment<Song>() {
     private val homeAdapter = SongAdapter(this)
diff --git a/app/src/main/res/drawable/ic_equalizer.xml b/app/src/main/res/drawable/ic_equalizer.xml
index b5a378e2a..c9016ecbe 100644
--- a/app/src/main/res/drawable/ic_equalizer.xml
+++ b/app/src/main/res/drawable/ic_equalizer.xml
@@ -2,9 +2,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M11,21V15H13V17H21V19H13V21ZM3,19V17H9V19ZM7,15V13H3V11H7V9H9V15ZM11,13V11H21V13ZM15,9V3H17V5H21V7H17V9ZM3,7V5H13V7Z" />
diff --git a/app/src/main/res/drawable/ic_more_24.xml b/app/src/main/res/drawable/ic_more_24.xml
index 281d42d22..782ef4327 100644
--- a/app/src/main/res/drawable/ic_more_24.xml
+++ b/app/src/main/res/drawable/ic_more_24.xml
@@ -2,9 +2,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,20Q11.175,20 10.588,19.413Q10,18.825 10,18Q10,17.175 10.588,16.587Q11.175,16 12,16Q12.825,16 13.413,16.587Q14,17.175 14,18Q14,18.825 13.413,19.413Q12.825,20 12,20ZM12,14Q11.175,14 10.588,13.412Q10,12.825 10,12Q10,11.175 10.588,10.587Q11.175,10 12,10Q12.825,10 13.413,10.587Q14,11.175 14,12Q14,12.825 13.413,13.412Q12.825,14 12,14ZM12,8Q11.175,8 10.588,7.412Q10,6.825 10,6Q10,5.175 10.588,4.588Q11.175,4 12,4Q12.825,4 13.413,4.588Q14,5.175 14,6Q14,6.825 13.413,7.412Q12.825,8 12,8Z" />
diff --git a/app/src/main/res/drawable/ic_paused_indicator_24.xml b/app/src/main/res/drawable/ic_paused_indicator_24.xml
index 714e83b9c..3e6c28802 100644
--- a/app/src/main/res/drawable/ic_paused_indicator_24.xml
+++ b/app/src/main/res/drawable/ic_paused_indicator_24.xml
@@ -5,7 +5,7 @@
     android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-                <path
-                    android:fillColor="@android:color/white"
-                    android:pathData="M 3.9997559 17.999935 L 3.9997559 19.999813 L 8.0000285 19.999813 L 8.0000285 17.999935 L 3.9997559 17.999935 z M 9.9999064 17.999935 L 9.9999064 19.999813 L 14.000179 19.999813 L 14.000179 17.999935 L 9.9999064 17.999935 z M 16.000057 17.999935 L 16.000057 19.999813 L 19.999813 19.999813 L 19.999813 17.999935 L 16.000057 17.999935 z " />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M 3.9997559 17.999935 L 3.9997559 19.999813 L 8.0000285 19.999813 L 8.0000285 17.999935 L 3.9997559 17.999935 z M 9.9999064 17.999935 L 9.9999064 19.999813 L 14.000179 19.999813 L 14.000179 17.999935 L 9.9999064 17.999935 z M 16.000057 17.999935 L 16.000057 19.999813 L 19.999813 19.999813 L 19.999813 17.999935 L 16.000057 17.999935 z " />
 </vector>
diff --git a/app/src/main/res/drawable/ic_playing_indicator_24.xml b/app/src/main/res/drawable/ic_playing_indicator_24.xml
index fe6877d05..31f56a07a 100644
--- a/app/src/main/res/drawable/ic_playing_indicator_24.xml
+++ b/app/src/main/res/drawable/ic_playing_indicator_24.xml
@@ -4,7 +4,7 @@
 
     <!--
     Yes, this whole file is all 30 frames of Spotify's equalizer animation
-    merged with the material equalizer icon, with each vector inlrined using
+    merged with the material equalizer icon, with each vector inlined using
     aapt:attr so that it does not clutter the drawable folder.
     -->
 
diff --git a/app/src/main/res/drawable/ui_remote_fab_container_paused.xml b/app/src/main/res/drawable/ui_remote_fab_container_paused.xml
index da659fc04..82362866f 100644
--- a/app/src/main/res/drawable/ui_remote_fab_container_paused.xml
+++ b/app/src/main/res/drawable/ui_remote_fab_container_paused.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <corners android:radius="@dimen/size_corners_mid_large" />
     <solid android:color="?attr/colorPrimary" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-h480dp/fragment_playback_panel.xml b/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
index 5805960e1..18a8eafa9 100644
--- a/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
@@ -31,8 +31,8 @@
         style="@style/Widget.Auxio.TextView.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_artist"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,8 +44,8 @@
         style="@style/Widget.Auxio.TextView.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_album"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -56,8 +56,8 @@
         style="@style/Widget.Auxio.TextView.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-h600dp/item_detail.xml b/app/src/main/res/layout-h600dp/item_detail.xml
index 54b914ab0..25e240706 100644
--- a/app/src/main/res/layout-h600dp/item_detail.xml
+++ b/app/src/main/res/layout-h600dp/item_detail.xml
@@ -19,13 +19,13 @@
         android:id="@+id/detail_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="Type"
+        android:layout_marginTop="@dimen/spacing_medium"
         android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
         android:textColor="?attr/colorSecondary"
-        android:layout_marginTop="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/detail_name"
         app:layout_constraintTop_toBottomOf="@+id/detail_cover"
-        tools:layout_editor_absoluteX="16dp" />
+        tools:layout_editor_absoluteX="16dp"
+        tools:text="Type" />
 
     <TextView
         android:id="@+id/detail_name"
diff --git a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
index 668f41c3e..26ef927c7 100644
--- a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
@@ -31,8 +31,8 @@
         style="@style/Widget.Auxio.TextView.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_artist"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,8 +44,8 @@
         style="@style/Widget.Auxio.TextView.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_album"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -56,8 +56,8 @@
         style="@style/Widget.Auxio.TextView.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 36da924b1..1f51aa1eb 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:transitionGroup="true"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    android:transitionGroup="true">
 
     <org.oxycblt.auxio.detail.DetailAppBarLayout
         android:id="@+id/detail_appbar"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d541880dc..90d6cc2a2 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -5,8 +5,8 @@
     android:id="@+id/home_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:transitionGroup="true"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    android:transitionGroup="true">
 
     <org.oxycblt.auxio.ui.AuxioAppBarLayout
         android:id="@+id/home_appbar"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 92ca0e5d0..0447c3b0c 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -5,8 +5,8 @@
     android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:transitionGroup="true"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    android:transitionGroup="true">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/explore_nav_host"
@@ -19,9 +19,9 @@
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/playback_sheet"
+        style="@style/Widget.Auxio.DisableDropShadows"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        style="@style/Widget.Auxio.DisableDropShadows"
         app:layout_behavior="org.oxycblt.auxio.playback.PlaybackSheetBehavior">
 
         <androidx.fragment.app.FragmentContainerView
@@ -39,10 +39,10 @@
 
         <LinearLayout
             android:id="@+id/queue_sheet"
+            style="@style/Widget.Auxio.DisableDropShadows"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            style="@style/Widget.Auxio.DisableDropShadows"
             app:layout_behavior="org.oxycblt.auxio.playback.queue.QueueSheetBehavior">
 
             <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index b4a27cf9f..acb71a15d 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:transitionGroup="true"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    android:transitionGroup="true">
 
     <org.oxycblt.auxio.ui.AuxioAppBarLayout
         style="@style/Widget.Auxio.AppBarLayout"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index c0dd1f0c2..50df905d5 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:transitionGroup="true"
     android:background="?attr/colorSurface"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:transitionGroup="true">
 
     <org.oxycblt.auxio.ui.AuxioAppBarLayout
         android:id="@+id/settings_appbar"
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index 8b5db7121..207ec2644 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -6,10 +6,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/ui_item_ripple"
+    android:paddingStart="@dimen/spacing_medium"
     android:paddingTop="@dimen/spacing_medium"
-    android:paddingBottom="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_mid_medium"
-    android:paddingStart="@dimen/spacing_medium">
+    android:paddingBottom="@dimen/spacing_medium">
 
     <!--
     We don't want to show an album cover, but we still want the spacing of this song
@@ -53,8 +53,8 @@
         style="@style/Widget.Auxio.TextView.Item.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/sel_accented_primary"
         android:layout_marginEnd="@dimen/spacing_small"
+        android:textColor="@color/sel_accented_primary"
         app:layout_constraintBottom_toTopOf="@+id/song_duration"
         app:layout_constraintEnd_toStartOf="@+id/song_menu"
         app:layout_constraintStart_toEndOf="@+id/song_track_bg"
@@ -80,8 +80,8 @@
         style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:icon="@drawable/ic_more_24"
         android:visibility="gone"
+        app:icon="@drawable/ic_more_24"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index 605b8427d..9a9b78415 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -20,13 +20,13 @@
         android:id="@+id/detail_type"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="Type"
+        android:layout_marginTop="@dimen/spacing_medium"
         android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
         android:textColor="?attr/colorSecondary"
-        android:layout_marginTop="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/detail_name"
         app:layout_constraintTop_toBottomOf="@+id/detail_cover"
-        tools:layout_editor_absoluteX="16dp" />
+        tools:layout_editor_absoluteX="16dp"
+        tools:text="Type" />
 
     <TextView
         android:id="@+id/detail_name"
diff --git a/app/src/main/res/layout/item_parent.xml b/app/src/main/res/layout/item_parent.xml
index 32df8e2b0..1e7f35e35 100644
--- a/app/src/main/res/layout/item_parent.xml
+++ b/app/src/main/res/layout/item_parent.xml
@@ -5,10 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/ui_item_ripple"
+    android:paddingStart="@dimen/spacing_medium"
     android:paddingTop="@dimen/spacing_medium"
-    android:paddingBottom="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_mid_medium"
-    android:paddingStart="@dimen/spacing_medium">
+    android:paddingBottom="@dimen/spacing_medium">
 
     <org.oxycblt.auxio.image.ImageGroup
         android:id="@+id/parent_image"
@@ -23,8 +23,8 @@
         style="@style/Widget.Auxio.TextView.Item.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/sel_accented_primary"
         android:layout_marginEnd="@dimen/spacing_mid_medium"
+        android:textColor="@color/sel_accented_primary"
         app:layout_constraintBottom_toTopOf="@+id/parent_info"
         app:layout_constraintEnd_toStartOf="@+id/parent_menu"
         app:layout_constraintStart_toEndOf="@+id/parent_image"
@@ -49,8 +49,8 @@
         style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:icon="@drawable/ic_more_24"
         android:visibility="gone"
+        app:icon="@drawable/ic_more_24"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 89911731c..fe1cc4292 100644
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -5,10 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/ui_item_ripple"
+    android:paddingStart="@dimen/spacing_medium"
     android:paddingTop="@dimen/spacing_medium"
-    android:paddingBottom="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_mid_medium"
-    android:paddingStart="@dimen/spacing_medium">
+    android:paddingBottom="@dimen/spacing_medium">
 
     <org.oxycblt.auxio.image.ImageGroup
         android:id="@+id/song_album_cover"
@@ -23,8 +23,8 @@
         style="@style/Widget.Auxio.TextView.Item.Primary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/sel_accented_primary"
         android:layout_marginEnd="@dimen/spacing_mid_medium"
+        android:textColor="@color/sel_accented_primary"
         app:layout_constraintBottom_toTopOf="@+id/song_info"
         app:layout_constraintEnd_toStartOf="@+id/song_menu"
         app:layout_constraintStart_toEndOf="@+id/song_album_cover"
@@ -49,8 +49,8 @@
         style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:icon="@drawable/ic_more_24"
         android:visibility="gone"
+        app:icon="@drawable/ic_more_24"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/menu/menu_playback.xml b/app/src/main/res/menu/menu_playback.xml
index ec8d17c38..5e2d73bc1 100644
--- a/app/src/main/res/menu/menu_playback.xml
+++ b/app/src/main/res/menu/menu_playback.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_open_equalizer"
-        android:title="@string/lbl_equalizer"
         android:icon="@drawable/ic_equalizer"
+        android:title="@string/lbl_equalizer"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_go_artist"
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index d55a942ad..214d186eb 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -52,9 +52,9 @@
             app:title="@string/set_round_mode" />
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
+            app:defaultValue="@integer/bar_action_next"
             app:entries="@array/entries_bar_action"
             app:entryValues="@array/values_bar_action"
-            app:defaultValue="@integer/bar_action_next"
             app:key="@string/set_key_bar_action"
             app:title="@string/set_bar_action" />
 
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index db9e3e7b4..6eb7d67bc 100644
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png
index 02e0ebd95..a4f245ce2 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot1.png differ