ui: rework iconography

Completely rework Auxio's iconography based on the new material symbols icon set. This does the following: 1. Switches the sharp + filled icon style to an outlined + round icon style. 2. Removes 32dp icons from everywhere except the playback panel. This does not: 1. Actually handle optical sizes right. This is going to take some more work to make it harmonious with the current UI. 2. Update margins in some places to be harmonious with the new icons. This is also going to take some more work to do properly.
2022-06-30 21:09:21 -06:00 · 2022-06-30 21:09:21 -06:00 · 090a1713dd
commit 090a1713dd
parent 9a17806da1
135 changed files with 653 additions and 674 deletions
--- a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
+++ b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt
@ -44,7 +44,7 @@ class AuxioApp : Application(), ImageLoaderFactory {
                ShortcutInfoCompat.Builder(this, SHORTCUT_SHUFFLE_ID)
                    .setShortLabel(getString(R.string.lbl_shuffle_shortcut_short))
                    .setLongLabel(getString(R.string.lbl_shuffle_shortcut_long))
-                    .setIcon(IconCompat.createWithResource(this, R.drawable.ic_shuffle_shortcut))
+                    .setIcon(IconCompat.createWithResource(this, R.drawable.ic_shortcut_shuffle_24))
                    .setIntent(
                        Intent(this, MainActivity::class.java).apply {
                            action = INTENT_KEY_SHORTCUT_SHUFFLE
--- a/app/src/main/java/org/oxycblt/auxio/image/ui/ImageGroup.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/ui/ImageGroup.kt
@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package org.oxycblt.auxio.image.ui
+package org.oxycblt.auxio.image

 import android.annotation.SuppressLint
 import android.content.Context
@ -50,7 +50,6 @@ class ImageGroup
 constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr: Int = 0) :
    FrameLayout(context, attrs, defStyleAttr) {
    private val cornerRadius: Float
-
    private val inner: StyledImageView
    private var customView: View? = null
    private val indicator: StyledImageView
@ -67,7 +66,7 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
        indicator =
            StyledImageView(context).apply {
                cornerRadius = this@ImageGroup.cornerRadius
-                staticIcon = context.getDrawableSafe(R.drawable.ic_equalizer)
+                staticIcon = context.getDrawableSafe(R.drawable.ic_currently_playing_24)
            }

        addView(inner)
--- a/app/src/main/java/org/oxycblt/auxio/image/ui/StyledImageView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/ui/StyledImageView.kt
@ -15,9 +15,12 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-package org.oxycblt.auxio.image.ui
+package org.oxycblt.auxio.image

 import android.content.Context
+import android.graphics.Canvas
+import android.graphics.ColorFilter
+import android.graphics.PixelFormat
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import androidx.annotation.AttrRes
@ -25,11 +28,11 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import coil.dispose
 import coil.load
 import com.google.android.material.shape.MaterialShapeDrawable
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.image.SquareFrameTransform
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.Genre
@ -68,11 +71,12 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr

    var staticIcon: Drawable? = null
        set(value) {
-            val wrapped = value?.let { StyledDrawable(context, it) }
-            field = wrapped
+            field = value?.let { StyledDrawable(context, it) }
            setImageDrawable(field)
        }

+    private var useLargeIcon: Boolean = false
+
    init {
        // Use clipToOutline and a background drawable to crop images. While Coil's transformation
        // could theoretically be used to round corners, the corner radius is dependent on the
@ -88,28 +92,30 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
            }

        val styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.StyledImageView)
-        val staticIconRes =
+        val staticIcon =
            styledAttrs.getResourceId(
                R.styleable.StyledImageView_staticIcon, ResourcesCompat.ID_NULL)
-        if (staticIconRes != ResourcesCompat.ID_NULL) {
-            staticIcon = context.getDrawableSafe(staticIconRes)
+        if (staticIcon != ResourcesCompat.ID_NULL) {
+            this.staticIcon = context.getDrawableSafe(staticIcon)
        }

+        useLargeIcon = styledAttrs.getBoolean(R.styleable.StyledImageView_useLargeIcon, false)
+
        cornerRadius = styledAttrs.getDimension(R.styleable.StyledImageView_cornerRadius, 0f)
        styledAttrs.recycle()
    }

    /** Bind the album cover for a [song]. */
-    fun bind(song: Song) = loadImpl(song, R.drawable.ic_song, R.string.desc_album_cover)
+    fun bind(song: Song) = loadImpl(song, R.drawable.ic_song_24, R.string.desc_album_cover)

    /** Bind the album cover for an [album]. */
-    fun bind(album: Album) = loadImpl(album, R.drawable.ic_album, R.string.desc_album_cover)
+    fun bind(album: Album) = loadImpl(album, R.drawable.ic_album_24, R.string.desc_album_cover)

    /** Bind the image for an [artist] */
-    fun bind(artist: Artist) = loadImpl(artist, R.drawable.ic_artist, R.string.desc_artist_image)
+    fun bind(artist: Artist) = loadImpl(artist, R.drawable.ic_artist_24, R.string.desc_artist_image)

    /** Bind the image for a [genre] */
-    fun bind(genre: Genre) = loadImpl(genre, R.drawable.ic_genre, R.string.desc_genre_image)
+    fun bind(genre: Genre) = loadImpl(genre, R.drawable.ic_genre_24, R.string.desc_genre_image)

    private fun <T : Music> loadImpl(music: T, @DrawableRes error: Int, @StringRes desc: Int) {
        if (staticIcon != null) {
@ -124,4 +130,31 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
            transformations(SquareFrameTransform.INSTANCE)
        }
    }
+
+    private class StyledDrawable(context: Context, private val src: Drawable) : Drawable() {
+        init {
+            DrawableCompat.setTintList(src, context.getColorStateListSafe(R.color.sel_on_cover_bg))
+        }
+
+        override fun draw(canvas: Canvas) {
+            val adjustWidth = bounds.width() / 4
+            val adjustHeight = bounds.height() / 4
+            src.bounds.set(
+                adjustWidth,
+                adjustHeight,
+                bounds.width() - adjustWidth,
+                bounds.height() - adjustHeight)
+            src.draw(canvas)
+        }
+
+        override fun setAlpha(alpha: Int) {
+            src.alpha = alpha
+        }
+
+        override fun setColorFilter(colorFilter: ColorFilter?) {
+            src.colorFilter = colorFilter
+        }
+
+        override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
+    }
 }
--- a/app/src/main/java/org/oxycblt/auxio/image/ui/StyledDrawable.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/ui/StyledDrawable.kt
@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2022 Auxio Project
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
- 
-package org.oxycblt.auxio.image.ui
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.ColorFilter
-import android.graphics.PixelFormat
-import android.graphics.drawable.Drawable
-import androidx.core.graphics.drawable.DrawableCompat
-import org.oxycblt.auxio.R
-import org.oxycblt.auxio.util.getColorStateListSafe
-
-/**
- * The internal drawable used by Auxio's images. Do not use this outside of this module.
- *
- * This enables a few features:
- * - Automatic tinting to the correct image tint
- * - Automatic sizing to HALF of the canvas.
- *
- * @author OxygenCobalt
- */
-class StyledDrawable(context: Context, private val src: Drawable) : Drawable() {
-    init {
-        // Re-tint the drawable to something that will play along with the background.
-        // Done here because this call (and nothing else) miraculously works on Lollipop devices
-        DrawableCompat.setTintList(src, context.getColorStateListSafe(R.color.sel_on_cover_bg))
-    }
-
-    override fun draw(canvas: Canvas) {
-        src.bounds.set(canvas.clipBounds)
-        val adjustWidth = src.bounds.width() / 4
-        val adjustHeight = src.bounds.height() / 4
-        src.bounds.set(
-            adjustWidth,
-            adjustHeight,
-            src.bounds.width() - adjustWidth,
-            src.bounds.height() - adjustHeight)
-        src.draw(canvas)
-    }
-
-    override fun setAlpha(alpha: Int) {
-        src.alpha = alpha
-    }
-
-    override fun setColorFilter(colorFilter: ColorFilter?) {
-        src.colorFilter = colorFilter
-    }
-
-    override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
-}
--- a/app/src/main/java/org/oxycblt/auxio/music/IndexerService.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/IndexerService.kt
@ -158,7 +158,7 @@ private class IndexerNotification(private val context: Context) :
            notificationManager.createNotificationChannel(channel)
        }

-        setSmallIcon(R.drawable.ic_indexer)
+        setSmallIcon(R.drawable.ic_indexer_32)
        setCategory(NotificationCompat.CATEGORY_SERVICE)
        setShowWhen(false)
        setSilent(true)
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
@ -183,7 +183,14 @@ class PlaybackPanelFragment :
    private fun updateRepeat(repeatMode: RepeatMode) {
        requireBinding().playbackRepeat.apply {
            isActivated = repeatMode != RepeatMode.NONE
-            icon = requireContext().getDrawableSafe(repeatMode.icon)
+            val iconRes =
+                when (repeatMode) {
+                    RepeatMode.NONE,
+                    RepeatMode.ALL -> R.drawable.ic_repeat_24
+                    RepeatMode.TRACK -> R.drawable.ic_repeat_one_24
+                }
+
+            icon = requireContext().getDrawableSafe(iconRes)
        }
    }

--- a/app/src/main/java/org/oxycblt/auxio/playback/state/RepeatMode.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/RepeatMode.kt
@ -18,7 +18,6 @@
 package org.oxycblt.auxio.playback.state

 import org.oxycblt.auxio.IntegerTable
-import org.oxycblt.auxio.R

 /**
 * Enum that determines the playback repeat mode.
@ -38,14 +37,6 @@ enum class RepeatMode {
        }
    }

-    val icon: Int
-        get() =
-            when (this) {
-                NONE -> R.drawable.ic_repeat
-                ALL -> R.drawable.ic_repeat_on
-                TRACK -> R.drawable.ic_repeat_one
-            }
-
    /** The integer code representing this particular mode. */
    val intCode: Int
        get() =
--- a/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/MediaSessionComponent.kt
@ -246,7 +246,7 @@ class MediaSessionComponent(private val context: Context, private val player: Pl
                    PlaybackStateCompat.CustomAction.Builder(
                            PlaybackService.ACTION_INC_REPEAT_MODE,
                            context.getString(R.string.desc_change_repeat),
-                            R.drawable.ic_remote_repeat_off)
+                            R.drawable.ic_remote_repeat_off_24)
                        .build())
                .setBufferedPosition(player.bufferedPosition)

--- a/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/system/NotificationComponent.kt
@ -64,7 +64,7 @@ class NotificationComponent(
            notificationManager.createNotificationChannel(channel)
        }

-        setSmallIcon(R.drawable.ic_auxio)
+        setSmallIcon(R.drawable.ic_auxio_24)
        setCategory(NotificationCompat.CATEGORY_SERVICE)
        setShowWhen(false)
        setSilent(true)
@ -72,10 +72,12 @@ class NotificationComponent(
        setVisibility(NotificationCompat.VISIBILITY_PUBLIC)

        addAction(buildRepeatAction(context, RepeatMode.NONE))
-        addAction(buildAction(context, PlaybackService.ACTION_SKIP_PREV, R.drawable.ic_skip_prev))
+        addAction(
+            buildAction(context, PlaybackService.ACTION_SKIP_PREV, R.drawable.ic_skip_prev_24))
        addAction(buildPlayPauseAction(context, true))
-        addAction(buildAction(context, PlaybackService.ACTION_SKIP_NEXT, R.drawable.ic_skip_next))
-        addAction(buildAction(context, PlaybackService.ACTION_EXIT, R.drawable.ic_close))
+        addAction(
+            buildAction(context, PlaybackService.ACTION_SKIP_NEXT, R.drawable.ic_skip_next_24))
+        addAction(buildAction(context, PlaybackService.ACTION_EXIT, R.drawable.ic_close_24))

        setStyle(MediaStyle().setMediaSession(sessionToken).setShowActionsInCompactView(1, 2, 3))
    }
@ -146,7 +148,7 @@ class NotificationComponent(
        context: Context,
        isPlaying: Boolean
    ): NotificationCompat.Action {
-        val drawableRes = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play
+        val drawableRes = if (isPlaying) R.drawable.ic_pause_24 else R.drawable.ic_play_24

        return buildAction(context, PlaybackService.ACTION_PLAY_PAUSE, drawableRes)
    }
@ -157,9 +159,9 @@ class NotificationComponent(
    ): NotificationCompat.Action {
        val drawableRes =
            when (repeatMode) {
-                RepeatMode.NONE -> R.drawable.ic_remote_repeat_off
-                RepeatMode.ALL -> R.drawable.ic_repeat
-                RepeatMode.TRACK -> R.drawable.ic_repeat_one
+                RepeatMode.NONE -> R.drawable.ic_remote_repeat_off_24
+                RepeatMode.ALL -> R.drawable.ic_remote_repeat_on_24
+                RepeatMode.TRACK -> R.drawable.ic_remote_repeat_one_24
            }

        return buildAction(context, PlaybackService.ACTION_INC_REPEAT_MODE, drawableRes)
@ -170,7 +172,7 @@ class NotificationComponent(
        isShuffled: Boolean
    ): NotificationCompat.Action {
        val drawableRes =
-            if (isShuffled) R.drawable.ic_shuffle else R.drawable.ic_remote_shuffle_off
+            if (isShuffled) R.drawable.ic_shuffle_24 else R.drawable.ic_remote_shuffle_off_24

        return buildAction(context, PlaybackService.ACTION_INVERT_SHUFFLE, drawableRes)
    }
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@ -181,10 +181,10 @@ class SettingsListFragment : PreferenceFragmentCompat() {
    @DrawableRes
    private fun Int.toThemeIcon(): Int {
        return when (this) {
-            AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -> R.drawable.ic_auto
-            AppCompatDelegate.MODE_NIGHT_NO -> R.drawable.ic_light
-            AppCompatDelegate.MODE_NIGHT_YES -> R.drawable.ic_dark
-            else -> R.drawable.ic_auto
+            AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -> R.drawable.ic_auto_24
+            AppCompatDelegate.MODE_NIGHT_NO -> R.drawable.ic_light_24
+            AppCompatDelegate.MODE_NIGHT_YES -> R.drawable.ic_dark_24
+            else -> R.drawable.ic_auto_24
        }
    }
 }
--- a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt
@ -506,7 +506,10 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
        logD("New state: $newState")
        this.state = newState

-        // TODO: Make accessibility better
+        // TODO: Improve accessibility by:
+        // 1. Adding a (non-visible) handle. Material components now technically does have
+        // this, but it relies on the busted BottomSheetBehavior.
+        // 2. Adding the controls that BottomSheetBehavior defines in-app.
        sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED)
    }

@ -519,8 +522,8 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
        val ratio = max(sheetOffset, 0f)

        val outRatio = 1 - ratio
-        val halfOutRatio = min(ratio / 0.5f, 1f)
-        val halfInRatio = max(ratio - 0.5f, 0f) / 0.5f
+        val halfOutRatio = min(ratio * 2, 1f)
+        val halfInRatio = max(ratio - 0.5f, 0f) * 2

        contentView.apply {
            alpha = outRatio
@ -542,7 +545,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
            // translation with a fraction of the said inset.
            lastInsets?.let { insets ->
                val bars = insets.getSystemBarInsetsCompat(this)
-                translationY = (bars.top * halfOutRatio)
+                translationY = bars.top * halfOutRatio
            }
        }

--- a/app/src/main/java/org/oxycblt/auxio/ui/DisplayMode.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/DisplayMode.kt
@ -44,19 +44,19 @@ enum class DisplayMode {
    val icon: Int
        get() =
            when (this) {
-                SHOW_SONGS -> R.drawable.ic_song
-                SHOW_ALBUMS -> R.drawable.ic_album
-                SHOW_ARTISTS -> R.drawable.ic_artist
-                SHOW_GENRES -> R.drawable.ic_genre
+                SHOW_SONGS -> R.drawable.ic_song_24
+                SHOW_ALBUMS -> R.drawable.ic_album_24
+                SHOW_ARTISTS -> R.drawable.ic_artist_24
+                SHOW_GENRES -> R.drawable.ic_genre_24
            }

    val itemId: Int
        get() =
            when (this) {
-                SHOW_SONGS -> R.drawable.ic_song
-                SHOW_ALBUMS -> R.drawable.ic_album
-                SHOW_ARTISTS -> R.drawable.ic_artist
-                SHOW_GENRES -> R.drawable.ic_genre
+                SHOW_SONGS -> R.drawable.ic_song_24
+                SHOW_ALBUMS -> R.drawable.ic_album_24
+                SHOW_ARTISTS -> R.drawable.ic_artist_24
+                SHOW_GENRES -> R.drawable.ic_genre_24
            }

    val intCode: Int
--- a/app/src/main/java/org/oxycblt/auxio/ui/coordinator/EdgeCoordinatorLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/coordinator/EdgeCoordinatorLayout.kt
@ -25,10 +25,10 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.children

 /**
- * Class that fixes an issue where [CoordinatorLayout] will override [onApplyWindowInsets] and
- * delegate the job to ***LAYOUT BEHAVIOR INSTANCES*** instead of the actual views.
+ * Class that manually overrides the busted window inset functionality of CoordinatorLayout in favor
+ * of a simple "delegate to child views" implementation.
 *
- * I can't believe I have to do this.
+ * @author OxygenCobalt
 */
 class EdgeCoordinatorLayout
@JvmOverloads
--- a/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt
@ -236,6 +236,9 @@ val AndroidViewModel.application: Application
 fun <R> SQLiteDatabase.queryAll(tableName: String, block: (Cursor) -> R) =
    query(tableName, null, null, null, null, null, null)?.use(block)

+// Note: ViewCompat.setOnApplyWindowInsets is a horrible buggy mess, so we use the native method
+// and convert the insets as needed to their compat forms.
+
 /**
 * Resolve system bar insets in a version-aware manner. This can be used to apply padding to a view
 * that properly follows all the frustrating changes that were made between Android 8-11.
--- a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt
@ -121,9 +121,9 @@ private fun RemoteViews.applyPlayPauseControls(
    setImageViewResource(
        R.id.widget_play_pause,
        if (state.isPlaying) {
-            R.drawable.ic_pause
+            R.drawable.ic_pause_24
        } else {
-            R.drawable.ic_play
+            R.drawable.ic_play_24
        })

    return this
@ -162,15 +162,15 @@ private fun RemoteViews.applyFullControls(
    // indicators.
    val shuffleRes =
        when {
-            state.isShuffled -> R.drawable.ic_remote_shuffle_on
-            else -> R.drawable.ic_remote_shuffle_off
+            state.isShuffled -> R.drawable.ic_remote_shuffle_on_24
+            else -> R.drawable.ic_remote_shuffle_off_24
        }

    val repeatRes =
        when (state.repeatMode) {
-            RepeatMode.NONE -> R.drawable.ic_remote_repeat_off
-            RepeatMode.ALL -> R.drawable.ic_repeat_on
-            RepeatMode.TRACK -> R.drawable.ic_repeat_one
+            RepeatMode.NONE -> R.drawable.ic_remote_repeat_off_24
+            RepeatMode.ALL -> R.drawable.ic_remote_repeat_on_24
+            RepeatMode.TRACK -> R.drawable.ic_remote_repeat_one_24
        }

    setImageViewResource(R.id.widget_shuffle, shuffleRes)
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt
@ -60,6 +60,10 @@ class WidgetComponent(private val context: Context) :
     * Force-update the widget.
     */
    fun update() {
+        // TODO: Rework margins/button layout to do the magic that other button bars do
+        // TODO: Try to change the error icon again
+        // TODO:
+
        // Updating Auxio's widget is unlike the rest of Auxio for a few reasons:
        // 1. We can't use the typical primitives like ViewModels
        // 2. The component range is far smaller, so we have to do some odd hacks to get
--- a/app/src/main/res/drawable-v31/ui_widget_panel.xml
+++ b/app/src/main/res/drawable-v31/ui_widget_panel.xml
@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <corners android:radius="@android:dimen/system_app_widget_background_radius" />
-    <solid android:color="?attr/colorSurface" />
+    <solid android:color="@android:color/white" />
 </shape>
--- a/app/src/main/res/drawable/ic_about.xml
+++ b/app/src/main/res/drawable/ic_about.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
-</vector>
--- a/app/src/main/res/drawable/ic_about_24.xml
+++ b/app/src/main/res/drawable/ic_about_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11,17H13V11H11ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q15.35,20 17.675,17.675Q20,15.35 20,12Q20,8.65 17.675,6.325Q15.35,4 12,4Q8.65,4 6.325,6.325Q4,8.65 4,12Q4,15.35 6.325,17.675Q8.65,20 12,20ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_accent.xml
+++ b/app/src/main/res/drawable/ic_accent.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorPrimary"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
-</vector>
--- a/app/src/main/res/drawable/ic_accent_24.xml
+++ b/app/src/main/res/drawable/ic_accent_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorPrimary">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13ZM12,20Q12.225,20 12.363,19.875Q12.5,19.75 12.5,19.55Q12.5,19.2 12.125,18.725Q11.75,18.25 11.75,17.3Q11.75,16.25 12.475,15.625Q13.2,15 14.25,15H16Q17.65,15 18.825,14.037Q20,13.075 20,11.05Q20,8.025 17.688,6.012Q15.375,4 12.2,4Q8.8,4 6.4,6.325Q4,8.65 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_album.xml
+++ b/app/src/main/res/drawable/ic_album.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,16.5c-2.49,0 -4.5,-2.01 -4.5,-4.5S9.51,7.5 12,7.5s4.5,2.01 4.5,4.5 -2.01,4.5 -4.5,4.5zM12,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1z" />
-</vector>
--- a/app/src/main/res/drawable/ic_album_24.xml
+++ b/app/src/main/res/drawable/ic_album_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,16.5Q13.875,16.5 15.188,15.188Q16.5,13.875 16.5,12Q16.5,10.125 15.188,8.812Q13.875,7.5 12,7.5Q10.125,7.5 8.812,8.812Q7.5,10.125 7.5,12Q7.5,13.875 8.812,15.188Q10.125,16.5 12,16.5ZM12,13Q11.575,13 11.288,12.712Q11,12.425 11,12Q11,11.575 11.288,11.287Q11.575,11 12,11Q12.425,11 12.713,11.287Q13,11.575 13,12Q13,12.425 12.713,12.712Q12.425,13 12,13ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q15.35,20 17.675,17.675Q20,15.35 20,12Q20,8.65 17.675,6.325Q15.35,4 12,4Q8.65,4 6.325,6.325Q4,8.65 4,12Q4,15.35 6.325,17.675Q8.65,20 12,20ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_artist.xml
+++ b/app/src/main/res/drawable/ic_artist.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
-</vector>
--- a/app/src/main/res/drawable/ic_artist_24.xml
+++ b/app/src/main/res/drawable/ic_artist_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M0,18V16.425Q0,15.325 1.113,14.662Q2.225,14 4,14Q4.325,14 4.625,14.012Q4.925,14.025 5.2,14.075Q4.85,14.575 4.675,15.15Q4.5,15.725 4.5,16.375V18ZM6,18V16.375Q6,14.75 7.663,13.75Q9.325,12.75 12,12.75Q14.7,12.75 16.35,13.75Q18,14.75 18,16.375V18ZM19.5,18V16.375Q19.5,15.725 19.337,15.15Q19.175,14.575 18.85,14.075Q19.125,14.025 19.413,14.012Q19.7,14 20,14Q21.8,14 22.9,14.662Q24,15.325 24,16.425V18ZM12,14.75Q10.575,14.75 9.45,15.125Q8.325,15.5 8.125,16H15.9Q15.675,15.5 14.562,15.125Q13.45,14.75 12,14.75ZM4,13Q3.175,13 2.588,12.412Q2,11.825 2,11Q2,10.15 2.588,9.575Q3.175,9 4,9Q4.85,9 5.425,9.575Q6,10.15 6,11Q6,11.825 5.425,12.412Q4.85,13 4,13ZM20,13Q19.175,13 18.587,12.412Q18,11.825 18,11Q18,10.15 18.587,9.575Q19.175,9 20,9Q20.85,9 21.425,9.575Q22,10.15 22,11Q22,11.825 21.425,12.412Q20.85,13 20,13ZM12,12Q10.75,12 9.875,11.125Q9,10.25 9,9Q9,7.725 9.875,6.862Q10.75,6 12,6Q13.275,6 14.137,6.862Q15,7.725 15,9Q15,10.25 14.137,11.125Q13.275,12 12,12ZM12,8Q11.575,8 11.288,8.287Q11,8.575 11,9Q11,9.425 11.288,9.712Q11.575,10 12,10Q12.425,10 12.713,9.712Q13,9.425 13,9Q13,8.575 12.713,8.287Q12.425,8 12,8ZM12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16Q12,16 12,16ZM12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Q12,9 12,9Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_auto.xml
+++ b/app/src/main/res/drawable/ic_auto.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorPrimary"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10.85,12.65h2.3L12,9l-1.15,3.65zM20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69L23.31,12 20,8.69zM14.3,16l-0.7,-2h-3.2l-0.7,2H7.8L11,7h2l3.2,9h-1.9z" />
-</vector>
--- a/app/src/main/res/drawable/ic_auto_24.xml
+++ b/app/src/main/res/drawable/ic_auto_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.8,16H9.4L10.2,13.7H13.85L14.65,16H16.2L12.8,7H11.2ZM10.65,12.4 L11.95,8.65H12.05L13.35,12.4ZM12,23.3 L8.65,20H4V15.35L0.7,12L4,8.65V4H8.65L12,0.7L15.35,4H20V8.65L23.3,12L20,15.35V20H15.35ZM12,12ZM12,20.5 L14.5,18H18V14.5L20.5,12L18,9.5V6H14.5L12,3.5L9.5,6H6V9.5L3.5,12L6,14.5V18H9.5Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_auxio_24.xml
+++ b/app/src/main/res/drawable/ic_auxio_24.xml
--- a/app/src/main/res/drawable/ic_back.xml
+++ b/app/src/main/res/drawable/ic_back.xml
@ -1,10 +0,0 @@
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
-</vector>
--- a/app/src/main/res/drawable/ic_back_24.xml
+++ b/app/src/main/res/drawable/ic_back_24.xml
@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,20 L4,12 12,4 13.425,5.4 7.825,11H20V13H7.825L13.425,18.6Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorSurface"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
-</vector>
--- a/app/src/main/res/drawable/ic_check_24.xml
+++ b/app/src/main/res/drawable/ic_check_24.xml
@ -7,5 +7,5 @@
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
-      android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9s9,-4.03 9,-9c0,-0.46 -0.04,-0.92 -0.1,-1.36c-0.98,1.37 -2.58,2.26 -4.4,2.26c-2.98,0 -5.4,-2.42 -5.4,-5.4c0,-1.81 0.89,-3.42 2.26,-4.4C12.92,3.04 12.46,3 12,3L12,3z"/>
+      android:pathData="M9.55,18 L3.85,12.3 5.275,10.875 9.55,15.15 18.725,5.975 20.15,7.4Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z" />
-</vector>
--- a/app/src/main/res/drawable/ic_close_24.xml
+++ b/app/src/main/res/drawable/ic_close_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6.4,19 L5,17.6 10.6,12 5,6.4 6.4,5 12,10.6 17.6,5 19,6.4 13.4,12 19,17.6 17.6,19 12,13.4Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_code.xml
+++ b/app/src/main/res/drawable/ic_code.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z" />
-</vector>
--- a/app/src/main/res/drawable/ic_code_24.xml
+++ b/app/src/main/res/drawable/ic_code_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,18 L2,12 8,6 9.425,7.425 4.825,12.025 9.4,16.6ZM16,18 L14.575,16.575 19.175,11.975 14.6,7.4 16,6 22,12Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_currently_playing_24.xml
+++ b/app/src/main/res/drawable/ic_currently_playing_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,20V12H8V20ZM10,20V4H14V20ZM16,20V9H20V20Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_dark_24.xml
+++ b/app/src/main/res/drawable/ic_dark_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,21Q8.25,21 5.625,18.375Q3,15.75 3,12Q3,8.25 5.625,5.625Q8.25,3 12,3Q12.35,3 12.688,3.025Q13.025,3.05 13.35,3.1Q12.325,3.825 11.713,4.987Q11.1,6.15 11.1,7.5Q11.1,9.75 12.675,11.325Q14.25,12.9 16.5,12.9Q17.875,12.9 19.025,12.287Q20.175,11.675 20.9,10.65Q20.95,10.975 20.975,11.312Q21,11.65 21,12Q21,15.75 18.375,18.375Q15.75,21 12,21ZM12,19Q14.2,19 15.95,17.788Q17.7,16.575 18.5,14.625Q18,14.75 17.5,14.825Q17,14.9 16.5,14.9Q13.425,14.9 11.262,12.738Q9.1,10.575 9.1,7.5Q9.1,7 9.175,6.5Q9.25,6 9.375,5.5Q7.425,6.3 6.213,8.05Q5,9.8 5,12Q5,14.9 7.05,16.95Q9.1,19 12,19ZM11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Q11.75,12.25 11.75,12.25Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,21h12L18,7L6,7v14zM8,9h8v10L8,19L8,9zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4h-3.5z" />
-</vector>
--- a/app/src/main/res/drawable/ic_delete_24.xml
+++ b/app/src/main/res/drawable/ic_delete_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6H4V4H9V3H15V4H20V6H19V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM17,6H7V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19ZM9,17H11V8H9ZM13,17H15V8H13ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_down.xml
+++ b/app/src/main/res/drawable/ic_down.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M 18.119999,7.0600006 12,13.166666 5.8800004,7.0600006 4.0000006,8.9400004 12,16.939999 19.999999,8.9400004 Z" />
-</vector>
--- a/app/src/main/res/drawable/ic_down_24.xml
+++ b/app/src/main/res/drawable/ic_down_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,15.375 L6,9.375 7.4,7.975 12,12.575 16.6,7.975 18,9.375Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_equalizer.xml
+++ b/app/src/main/res/drawable/ic_equalizer.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10,20h4L14,4h-4v16zM4,20h4v-8L4,12v8zM16,9v11h4L20,9h-4z" />
-</vector>
-
--- a/app/src/main/res/drawable/ic_faq.xml
+++ b/app/src/main/res/drawable/ic_faq.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
-</vector>
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z" />
-</vector>
--- a/app/src/main/res/drawable/ic_filter_24.xml
+++ b/app/src/main/res/drawable/ic_filter_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,18V16H14V18ZM6,13V11H18V13ZM3,8V6H21V8Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_genre.xml
+++ b/app/src/main/res/drawable/ic_genre.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7 14c-1.66 0-3 1.34-3 3 0 1.31-1.16 2-2 2 0.92 1.22 2.49 2 4 2 2.21 0 4-1.79 4-4 0-1.66-1.34-3-3-3zm13.71-9.37l-1.34-1.34c-0.39-0.39-1.02-0.39-1.41 0L9 12.25 11.75 15l8.96-8.96c0.39-0.39 0.39-1.02 0-1.41z" />
-</vector>
--- a/app/src/main/res/drawable/ic_genre_24.xml
+++ b/app/src/main/res/drawable/ic_genre_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,21Q4.875,21 3.775,20.45Q2.675,19.9 2,19Q2.65,19 3.325,18.488Q4,17.975 4,17Q4,15.75 4.875,14.875Q5.75,14 7,14Q8.25,14 9.125,14.875Q10,15.75 10,17Q10,18.65 8.825,19.825Q7.65,21 6,21ZM6,19Q6.825,19 7.412,18.413Q8,17.825 8,17Q8,16.575 7.713,16.288Q7.425,16 7,16Q6.575,16 6.287,16.288Q6,16.575 6,17Q6,17.575 5.863,18.05Q5.725,18.525 5.5,18.95Q5.625,19 5.75,19Q5.875,19 6,19ZM11.75,15 L9,12.25 17.95,3.3Q18.225,3.025 18.638,3.012Q19.05,3 19.35,3.3L20.7,4.65Q21,4.95 21,5.35Q21,5.75 20.7,6.05ZM7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Q7,17 7,17Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_handle_24.xml
+++ b/app/src/main/res/drawable/ic_handle_24.xml
@ -2,10 +2,10 @@
 <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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M8,5v14l11,-7L8,5z" />
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,15V13H20V15ZM4,11V9H20V11Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_help_24.xml
+++ b/app/src/main/res/drawable/ic_help_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.95,18Q12.475,18 12.838,17.637Q13.2,17.275 13.2,16.75Q13.2,16.225 12.838,15.863Q12.475,15.5 11.95,15.5Q11.425,15.5 11.062,15.863Q10.7,16.225 10.7,16.75Q10.7,17.275 11.062,17.637Q11.425,18 11.95,18ZM11.05,14.15H12.9Q12.9,13.325 13.088,12.85Q13.275,12.375 14.15,11.55Q14.8,10.9 15.175,10.312Q15.55,9.725 15.55,8.9Q15.55,7.5 14.525,6.75Q13.5,6 12.1,6Q10.675,6 9.788,6.75Q8.9,7.5 8.55,8.55L10.2,9.2Q10.325,8.75 10.763,8.225Q11.2,7.7 12.1,7.7Q12.9,7.7 13.3,8.137Q13.7,8.575 13.7,9.1Q13.7,9.6 13.4,10.037Q13.1,10.475 12.65,10.85Q11.55,11.825 11.3,12.325Q11.05,12.825 11.05,14.15ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q15.35,20 17.675,17.675Q20,15.35 20,12Q20,8.65 17.675,6.325Q15.35,4 12,4Q8.65,4 6.325,6.325Q4,8.65 4,12Q4,15.35 6.325,17.675Q8.65,20 12,20ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_indexer.xml
+++ b/app/src/main/res/drawable/ic_indexer.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M4.2,5l-0.7,1.9L17.6,12L3,12v8h18v-8.86L4.2,5zM7,17L5,17v-2h2v2zM19,17L9,17v-2h10v2z" />
-</vector>
--- a/app/src/main/res/drawable/ic_indexer_32.xml
+++ b/app/src/main/res/drawable/ic_indexer_32.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.6,12 L3.5,6.9 4.2,5 19.8,10.7Q20.3,10.9 20.65,11.4Q21,11.9 21,12.5V18Q21,18.825 20.413,19.413Q19.825,20 19,20H5Q4.175,20 3.587,19.413Q3,18.825 3,18V14Q3,13.175 3.587,12.587Q4.175,12 5,12ZM19,18Q19,18 19,18Q19,18 19,18V14Q19,14 19,14Q19,14 19,14H5Q5,14 5,14Q5,14 5,14V18Q5,18 5,18Q5,18 5,18ZM10,17H18V15H10ZM7,17Q7.425,17 7.713,16.712Q8,16.425 8,16Q8,15.575 7.713,15.287Q7.425,15 7,15Q6.575,15 6.287,15.287Q6,15.575 6,16Q6,16.425 6.287,16.712Q6.575,17 7,17ZM5,18Q5,18 5,18Q5,18 5,18V14Q5,14 5,14Q5,14 5,14Q5,14 5,14Q5,14 5,14V18Q5,18 5,18Q5,18 5,18Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_license.xml
+++ b/app/src/main/res/drawable/ic_license.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M4.01,2L4,22h16V8l-6,-6H4.01zM13,9V3.5L18.5,9H13z" />
-</vector>
--- a/app/src/main/res/drawable/ic_license_24.xml
+++ b/app/src/main/res/drawable/ic_license_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,21V19H16V21ZM9.65,16.15 L4,10.5 6.1,8.35 11.8,14ZM16,9.8 L10.35,4.1 12.5,2 18.15,7.65ZM20.6,20 L7.55,6.95 8.95,5.55 22,18.6Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_light.xml
+++ b/app/src/main/res/drawable/ic_light.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorPrimary"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5s5,-2.24 5,-5S14.76,7 12,7L12,7zM11,1v4h2V1L11,1zM11,19v4h2v-4L11,19zM23,11l-4,0v2l4,0V11zM5,11l-4,0l0,2l4,0L5,11zM16.24,17.66l2.47,2.47l1.41,-1.41l-2.47,-2.47L16.24,17.66zM3.87,5.28l2.47,2.47l1.41,-1.41L5.28,3.87L3.87,5.28zM6.34,16.24l-2.47,2.47l1.41,1.41l2.47,-2.47L6.34,16.24zM18.72,3.87l-2.47,2.47l1.41,1.41l2.47,-2.47L18.72,3.87z" />
-</vector>
--- a/app/src/main/res/drawable/ic_light_24.xml
+++ b/app/src/main/res/drawable/ic_light_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,15Q13.25,15 14.125,14.125Q15,13.25 15,12Q15,10.75 14.125,9.875Q13.25,9 12,9Q10.75,9 9.875,9.875Q9,10.75 9,12Q9,13.25 9.875,14.125Q10.75,15 12,15ZM12,17Q9.925,17 8.463,15.537Q7,14.075 7,12Q7,9.925 8.463,8.462Q9.925,7 12,7Q14.075,7 15.538,8.462Q17,9.925 17,12Q17,14.075 15.538,15.537Q14.075,17 12,17ZM2,13Q1.575,13 1.288,12.712Q1,12.425 1,12Q1,11.575 1.288,11.287Q1.575,11 2,11H4Q4.425,11 4.713,11.287Q5,11.575 5,12Q5,12.425 4.713,12.712Q4.425,13 4,13ZM20,13Q19.575,13 19.288,12.712Q19,12.425 19,12Q19,11.575 19.288,11.287Q19.575,11 20,11H22Q22.425,11 22.712,11.287Q23,11.575 23,12Q23,12.425 22.712,12.712Q22.425,13 22,13ZM12,5Q11.575,5 11.288,4.712Q11,4.425 11,4V2Q11,1.575 11.288,1.287Q11.575,1 12,1Q12.425,1 12.713,1.287Q13,1.575 13,2V4Q13,4.425 12.713,4.712Q12.425,5 12,5ZM12,23Q11.575,23 11.288,22.712Q11,22.425 11,22V20Q11,19.575 11.288,19.288Q11.575,19 12,19Q12.425,19 12.713,19.288Q13,19.575 13,20V22Q13,22.425 12.713,22.712Q12.425,23 12,23ZM5.65,7.05 L4.575,6Q4.275,5.725 4.287,5.3Q4.3,4.875 4.575,4.575Q4.875,4.275 5.3,4.275Q5.725,4.275 6,4.575L7.05,5.65Q7.325,5.95 7.325,6.35Q7.325,6.75 7.05,7.05Q6.775,7.35 6.363,7.337Q5.95,7.325 5.65,7.05ZM18,19.425 L16.95,18.35Q16.675,18.05 16.675,17.638Q16.675,17.225 16.95,16.95Q17.225,16.65 17.638,16.663Q18.05,16.675 18.35,16.95L19.425,18Q19.725,18.275 19.713,18.7Q19.7,19.125 19.425,19.425Q19.125,19.725 18.7,19.725Q18.275,19.725 18,19.425ZM16.95,7.05Q16.65,6.775 16.663,6.362Q16.675,5.95 16.95,5.65L18,4.575Q18.275,4.275 18.7,4.287Q19.125,4.3 19.425,4.575Q19.725,4.875 19.725,5.3Q19.725,5.725 19.425,6L18.35,7.05Q18.05,7.325 17.65,7.325Q17.25,7.325 16.95,7.05ZM4.575,19.425Q4.275,19.125 4.275,18.7Q4.275,18.275 4.575,18L5.65,16.95Q5.95,16.675 6.363,16.675Q6.775,16.675 7.05,16.95Q7.35,17.225 7.338,17.638Q7.325,18.05 7.05,18.35L6,19.425Q5.725,19.725 5.3,19.712Q4.875,19.7 4.575,19.425ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
-</vector>
--- a/app/src/main/res/drawable/ic_pause_24.xml
+++ b/app/src/main/res/drawable/ic_pause_24.xml
@ -2,10 +2,10 @@
 <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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z" />
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14,19V5H18V19ZM6,19V5H10V19Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_pause_32.xml
+++ b/app/src/main/res/drawable/ic_pause_32.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M 19.005724,25.685114 V 6.3148861 h 5.744275 V 25.685114 Z m -11.7557234,0 V 6.3148861 H 12.994275 V 25.685114 Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_play_24.xml
+++ b/app/src/main/res/drawable/ic_play_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,19V5L19,12ZM10,12ZM10,15.35 L15.25,12 10,8.65Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_play_32.xml
+++ b/app/src/main/res/drawable/ic_play_32.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M 10.399999,25.400001 V 6.6000001 L 25.233332,16 Z M 13.266666,16 Z m 0,4.133334 L 19.833332,16 13.266666,11.866667 Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_queue.xml
+++ b/app/src/main/res/drawable/ic_queue.xml
@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/sel_accented"
    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15,6H3v2h12V6zM15,10H3v2h12V10zM3,16h8v-2H3V16zM17,6v8.18C16.69,14.07 16.35,14 16,14c-1.66,0 -3,1.34 -3,3s1.34,3 3,3s3,-1.34 3,-3V8h3V6H17z" />
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16,20Q14.75,20 13.875,19.125Q13,18.25 13,17Q13,15.75 13.875,14.875Q14.75,14 16,14Q16.275,14 16.525,14.037Q16.775,14.075 17,14.2V6H22V8H19V17Q19,18.25 18.125,19.125Q17.25,20 16,20ZM3,16V14H11V16ZM3,12V10H15V12ZM3,8V6H15V8Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_remote_default_cover.xml
+++ b/app/src/main/res/drawable/ic_remote_default_cover.xml
@ -4,18 +4,10 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
-    <!--
-    Special album icon where the center is filled with the surface color.
-
-    We would normally use a song icon with a filled-in background, but RemoteView
-    limitations make that effectively impossible. Once again, the widget has to
-    be inconsistent with the rest of the app because google refuses to dumpster
-    a terrible API.
-    -->
-    <path
-        android:fillColor="?attr/colorPrimary"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,16.5c-2.49,0 -4.5,-2.01 -4.5,-4.5S9.51,7.5 12,7.5s4.5,2.01 4.5,4.5 -2.01,4.5 -4.5,4.5zM12,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1z" />
+  <path
+      android:fillColor="?attr/colorPrimary"
+      android:pathData="M12,16.5Q13.875,16.5 15.188,15.188Q16.5,13.875 16.5,12Q16.5,10.125 15.188,8.812Q13.875,7.5 12,7.5Q10.125,7.5 8.812,8.812Q7.5,10.125 7.5,12Q7.5,13.875 8.812,15.188Q10.125,16.5 12,16.5ZM12,13Q11.575,13 11.288,12.712Q11,12.425 11,12Q11,11.575 11.288,11.287Q11.575,11 12,11Q12.425,11 12.713,11.287Q13,11.575 13,12Q13,12.425 12.713,12.712Q12.425,13 12,13ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q15.35,20 17.675,17.675Q20,15.35 20,12Q20,8.65 17.675,6.325Q15.35,4 12,4Q8.65,4 6.325,6.325Q4,8.65 4,12Q4,15.35 6.325,17.675Q8.65,20 12,20ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Z"/>
    <path
        android:fillColor="?attr/colorSurface"
-        android:pathData="M 11.999988,7.5000052 C 10.26837,7.4769007 8.5915309,8.560755 7.896993,10.146219 c -0.7453054,1.607465 -0.4180795,3.637951 0.8068934,4.921183 1.166041,1.284666 3.1054606,1.767719 4.7412966,1.196892 1.694811,-0.550604 2.957738,-2.193714 3.045894,-3.974751 0.132222,-1.713727 -0.824064,-3.4451124 -2.343934,-4.2469378 -0.655277,-0.3575862 -1.401101,-0.5431647 -2.147155,-0.5426 z m 0,3.5000448 c 0.727249,-0.03179 1.254295,0.852995 0.879019,1.475902 -0.300918,0.612861 -1.237867,0.707058 -1.649512,0.15916 -0.489216,-0.537264 -0.143543,-1.499245 0.56999,-1.614362 0.06589,-0.01409 0.133207,-0.02062 0.200503,-0.0207 z" />
+        android:pathData="M 11.999784 1.9998779 A 10 9.999999 0 0 1 22.000208 11.999784 C 22.000208 10.616452 21.737475 9.3164294 21.212142 8.099764 C 20.687476 6.8830985 19.974804 5.8247631 19.074805 4.924764 C 18.174806 4.0247649 17.11647 3.3122428 15.899805 2.78691 C 14.683139 2.2622439 13.383116 1.9998779 11.999784 1.9998779 z M 11.999784 1.9998779 C 10.616452 1.9998779 9.3164294 2.2622439 8.099764 2.78691 C 6.8830985 3.3122428 5.8247631 4.0247649 4.924764 4.924764 C 4.0247649 5.8247631 3.3126097 6.8830985 2.7879435 8.099764 C 2.2626107 9.3164294 1.9998779 10.616452 1.9998779 11.999784 A 10 9.999999 0 0 1 11.999784 1.9998779 z M 1.9998779 11.999784 C 1.9998779 13.383116 2.2626107 14.683139 2.7879435 15.899805 C 3.3126097 17.11647 4.0247649 18.174806 4.924764 19.074805 C 5.8247631 19.974804 6.8830985 20.687476 8.099764 21.212142 C 9.3164294 21.737475 10.616452 22.000208 11.999784 22.000208 A 10 9.999999 0 0 1 1.9998779 11.999784 z M 11.999784 22.000208 C 13.383116 22.000208 14.683139 21.737475 15.899805 21.212142 C 17.11647 20.687476 18.174806 19.974804 19.074805 19.074805 C 19.974804 18.174806 20.687476 17.11647 21.212142 15.899805 C 21.737475 14.683139 22.000208 13.383116 22.000208 11.999784 A 10 9.999999 0 0 1 11.999784 22.000208 z M 11.999784 3.9997559 C 9.7664532 3.9997559 7.8751938 4.7751969 6.3251953 6.3251953 C 4.7751969 7.8751938 3.9997559 9.7664532 3.9997559 11.999784 C 3.9997559 14.233115 4.7751969 16.124892 6.3251953 17.67489 C 7.8751938 19.224889 9.7664532 19.999813 11.999784 19.999813 C 14.233115 19.999813 16.124892 19.224889 17.67489 17.67489 C 19.224889 16.124892 19.999813 14.233115 19.999813 11.999784 C 19.999813 9.7664532 19.224889 7.8751938 17.67489 6.3251953 C 16.124892 4.7751969 14.233115 3.9997559 11.999784 3.9997559 z M 11.999784 7.4998006 C 13.249783 7.4998006 14.312888 7.9371994 15.18822 8.8118652 C 16.062886 9.6871977 16.499768 10.749786 16.499768 11.999784 C 16.499768 13.249783 16.062886 14.312888 15.18822 15.18822 C 14.312888 16.062886 13.249783 16.499768 11.999784 16.499768 C 10.749786 16.499768 9.6871977 16.062886 8.8118652 15.18822 C 7.9371994 14.312888 7.4998006 13.249783 7.4998006 11.999784 C 7.4998006 10.749786 7.9371994 9.6871977 8.8118652 8.8118652 C 9.6871977 7.9371994 10.749786 7.4998006 11.999784 7.4998006 z M 11.999784 10.999845 C 11.716451 10.999845 11.479533 11.095833 11.2882 11.287166 C 11.0962 11.479166 10.999845 11.716451 10.999845 11.999784 C 10.999845 12.283117 11.0962 12.520552 11.2882 12.711886 C 11.479533 12.903885 11.716451 13.00024 11.999784 13.00024 C 12.283117 13.00024 12.520919 12.903885 12.712919 12.711886 C 12.904252 12.520552 13.00024 12.283117 13.00024 11.999784 C 13.00024 11.716451 12.904252 11.479166 12.712919 11.287166 C 12.520919 11.095833 12.283117 10.999845 11.999784 10.999845 z " />
 </vector>
--- a/app/src/main/res/drawable/ic_remote_repeat_off_24.xml
+++ b/app/src/main/res/drawable/ic_remote_repeat_off_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@color/remote_translucent"
+      android:pathData="M7,22 L3,18 7,14 8.4,15.45 6.85,17H17V13H19V19H6.85L8.4,20.55ZM5,11V5H17.15L15.6,3.45L17,2L21,6L17,10L15.6,8.55L17.15,7H7V11Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_remote_repeat_on_24.xml
+++ b/app/src/main/res/drawable/ic_remote_repeat_on_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorPrimary">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,22 L3,18 7,14 8.4,15.45 6.85,17H17V13H19V19H6.85L8.4,20.55ZM5,11V5H17.15L15.6,3.45L17,2L21,6L17,10L15.6,8.55L17.15,7H7V11Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_remote_repeat_one_24.xml
+++ b/app/src/main/res/drawable/ic_remote_repeat_one_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorPrimary">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.5,15V10.5H10V9H13V15ZM7,22 L3,18 7,14 8.4,15.45 6.85,17H17V13H19V19H6.85L8.4,20.55ZM5,11V5H17.15L15.6,3.45L17,2L21,6L17,10L15.6,8.55L17.15,7H7V11Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_remote_shuffle_off.xml
+++ b/app/src/main/res/drawable/ic_remote_shuffle_off.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="#80FFFFFF"
-        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>
--- a/app/src/main/res/drawable/ic_remote_shuffle_off_24.xml
+++ b/app/src/main/res/drawable/ic_remote_shuffle_off_24.xml
@ -7,5 +7,5 @@
    android:viewportHeight="24">
    <path
        android:fillColor="@color/remote_translucent"
-        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
+        android:pathData="M9.175,10.575 L4,5.4 5.4,4 10.575,9.175ZM14,20V18H16.6L13.425,14.825L14.85,13.4L18,16.55V14H20V20ZM5.4,20 L4,18.6 16.6,6H14V4H20V10H18V7.4Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_remote_shuffle_on.xml
+++ b/app/src/main/res/drawable/ic_remote_shuffle_on.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorPrimary"
-    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>
--- a/app/src/main/res/drawable/ic_remote_shuffle_on_24.xml
+++ b/app/src/main/res/drawable/ic_remote_shuffle_on_24.xml
@ -7,5 +7,5 @@
    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" />
+        android:pathData="M9.175,10.575 L4,5.4 5.4,4 10.575,9.175ZM14,20V18H16.6L13.425,14.825L14.85,13.4L18,16.55V14H20V20ZM5.4,20 L4,18.6 16.6,6H14V4H20V10H18V7.4Z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_repeat.xml
+++ b/app/src/main/res/drawable/ic_repeat.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <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>
--- a/app/src/main/res/drawable/ic_repeat_24.xml
+++ b/app/src/main/res/drawable/ic_repeat_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+      android:pathData="M 9.3333328,29.333332 3.9999997,23.999999 9.3333328,18.666666 11.199999,20.599999 9.1333328,22.666666 H 22.666666 v -5.333334 h 2.666666 v 8 H 9.1333328 l 2.0666662,2.066667 z M 6.6666662,14.666666 V 6.6666662 H 22.866666 l -2.066667,-2.0666665 1.866667,-1.9333332 5.333333,5.333333 -5.333333,5.3333335 -1.866667,-1.933334 2.066667,-2.0666662 H 9.3333328 v 5.3333332 z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_repeat_one.xml
+++ b/app/src/main/res/drawable/ic_repeat_one.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorPrimary"
-    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>
--- a/app/src/main/res/drawable/ic_repeat_one_24.xml
+++ b/app/src/main/res/drawable/ic_repeat_one_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.5,15V10.5H10V9H13V15ZM7,22 L3,18 7,14 8.4,15.45 6.85,17H17V13H19V19H6.85L8.4,20.55ZM5,11V5H17.15L15.6,3.45L17,2L21,6L17,10L15.6,8.55L17.15,7H7V11Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
-</vector>
--- a/app/src/main/res/drawable/ic_search_24.xml
+++ b/app/src/main/res/drawable/ic_search_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.6,21 L13.3,14.7Q12.55,15.3 11.575,15.65Q10.6,16 9.5,16Q6.775,16 4.888,14.113Q3,12.225 3,9.5Q3,6.775 4.888,4.887Q6.775,3 9.5,3Q12.225,3 14.113,4.887Q16,6.775 16,9.5Q16,10.6 15.65,11.575Q15.3,12.55 14.7,13.3L21,19.6ZM9.5,14Q11.375,14 12.688,12.688Q14,11.375 14,9.5Q14,7.625 12.688,6.312Q11.375,5 9.5,5Q7.625,5 6.312,6.312Q5,7.625 5,9.5Q5,11.375 6.312,12.688Q7.625,14 9.5,14Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19.44,12.99l-0.01,0.02c0.04,-0.33 0.08,-0.67 0.08,-1.01 0,-0.34 -0.03,-0.66 -0.07,-0.99l0.01,0.02 2.44,-1.92 -2.43,-4.22 -2.87,1.16 0.01,0.01c-0.52,-0.4 -1.09,-0.74 -1.71,-1h0.01L14.44,2H9.57l-0.44,3.07h0.01c-0.62,0.26 -1.19,0.6 -1.71,1l0.01,-0.01 -2.88,-1.17 -2.44,4.22 2.44,1.92 0.01,-0.02c-0.04,0.33 -0.07,0.65 -0.07,0.99 0,0.34 0.03,0.68 0.08,1.01l-0.01,-0.02 -2.1,1.65 -0.33,0.26 2.43,4.2 2.88,-1.15 -0.02,-0.04c0.53,0.41 1.1,0.75 1.73,1.01h-0.03L9.58,22h4.85s0.03,-0.18 0.06,-0.42l0.38,-2.65h-0.01c0.62,-0.26 1.2,-0.6 1.73,-1.01l-0.02,0.04 2.88,1.15 2.43,-4.2s-0.14,-0.12 -0.33,-0.26l-2.11,-1.66zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
-</vector>
--- a/app/src/main/res/drawable/ic_shortcut_shuffle_24.xml
+++ b/app/src/main/res/drawable/ic_shortcut_shuffle_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#0061A6">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9.175,10.575 L4,5.4 5.4,4 10.575,9.175ZM14,20V18H16.6L13.425,14.825L14.85,13.4L18,16.55V14H20V20ZM5.4,20 L4,18.6 16.6,6H14V4H20V10H18V7.4Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_shuffle.xml
+++ b/app/src/main/res/drawable/ic_shuffle.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <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>
--- a/app/src/main/res/drawable/ic_shuffle_24.xml
+++ b/app/src/main/res/drawable/ic_shuffle_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9.175,10.575 L4,5.4 5.4,4 10.575,9.175ZM14,20V18H16.6L13.425,14.825L14.85,13.4L18,16.55V14H20V20ZM5.4,20 L4,18.6 16.6,6H14V4H20V10H18V7.4Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_shuffle_shortcut.xml
+++ b/app/src/main/res/drawable/ic_shuffle_shortcut.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/black"
-        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>
--- a/app/src/main/res/drawable/ic_skip_next.xml
+++ b/app/src/main/res/drawable/ic_skip_next.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    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>
--- a/app/src/main/res/drawable/ic_skip_next_24.xml
+++ b/app/src/main/res/drawable/ic_skip_next_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16.5,18V6H18.5V18ZM5.5,18V6L14.5,12ZM7.5,12ZM7.5,14.25 L10.9,12 7.5,9.75Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_skip_prev.xml
+++ b/app/src/main/res/drawable/ic_skip_prev.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:autoMirrored="true"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,6h2v12L6,18L6,6zM9.5,12l8.5,6L18,6l-8.5,6z" />
-</vector>
--- a/app/src/main/res/drawable/ic_skip_prev_24.xml
+++ b/app/src/main/res/drawable/ic_skip_prev_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5.5,18V6H7.5V18ZM18.5,18 L9.5,12 18.5,6ZM16.5,12ZM16.5,14.25V9.75L13.1,12Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_song.xml
+++ b/app/src/main/res/drawable/ic_song.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z" />
-</vector>
--- a/app/src/main/res/drawable/ic_song_24.xml
+++ b/app/src/main/res/drawable/ic_song_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,21Q8.35,21 7.175,19.825Q6,18.65 6,17Q6,15.35 7.175,14.175Q8.35,13 10,13Q10.575,13 11.062,13.137Q11.55,13.275 12,13.55V3H18V7H14V17Q14,18.65 12.825,19.825Q11.65,21 10,21Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_sort.xml
+++ b/app/src/main/res/drawable/ic_sort.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
-</vector>
--- a/app/src/main/res/drawable/ic_sort_24.xml
+++ b/app/src/main/res/drawable/ic_sort_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,18V16H9V18ZM3,13V11H15V13ZM3,8V6H21V8Z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_time.xml
+++ b/app/src/main/res/drawable/ic_time.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7L11,7v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
-</vector>
--- a/app/src/main/res/drawable/ic_time_24.xml
+++ b/app/src/main/res/drawable/ic_time_24.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.3,16.7 L16.7,15.3 13,11.6V7H11V12.4ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
+</vector>
--- a/app/src/main/res/drawable/sel_playing_state.xml
+++ b/app/src/main/res/drawable/sel_playing_state.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_pause" android:state_activated="true" />
-    <item android:drawable="@drawable/ic_play" />
-</selector>
--- a/app/src/main/res/drawable/sel_playing_state_24.xml
+++ b/app/src/main/res/drawable/sel_playing_state_24.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_pause_24" android:state_activated="true" />
+    <item android:drawable="@drawable/ic_play_24" />
+</selector>
--- a/app/src/main/res/drawable/ui_widget_panel.xml
+++ b/app/src/main/res/drawable/ui_widget_panel.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <solid android:color="?attr/colorSurface" />
+    <solid android:color="@android:color/white" />
 </shape>
--- a/app/src/main/res/layout-h600dp/item_detail.xml
+++ b/app/src/main/res/layout-h600dp/item_detail.xml
@ -6,14 +6,14 @@
    android:layout_height="match_parent"
    android:padding="@dimen/spacing_medium">

-    <org.oxycblt.auxio.image.ui.StyledImageView
+    <org.oxycblt.auxio.image.StyledImageView
        android:id="@+id/detail_cover"
        style="@style/Widget.Auxio.Image.Huge"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        tools:ignore="ContentDescription"
-        tools:staticIcon="@drawable/ic_artist" />
+        tools:staticIcon="@drawable/ic_song_48" />

    <TextView
        android:id="@+id/detail_name"
--- a/app/src/main/res/layout-land/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-land/fragment_playback_panel.xml
@ -14,7 +14,7 @@
        app:title="@string/lbl_playback"
        tools:subtitle="@string/lbl_all_songs" />

-    <org.oxycblt.auxio.image.ui.StyledImageView
+    <org.oxycblt.auxio.image.StyledImageView
        android:id="@+id/playback_cover"
        style="@style/Widget.Auxio.Image.Full"
        android:layout_marginStart="@dimen/spacing_medium"
@ -23,7 +23,7 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
        app:layout_constraintVertical_chainStyle="packed"
-        tools:staticIcon="@drawable/ic_album" />
+        tools:staticIcon="@drawable/ic_song_48" />

    <!-- TextView is wrapped in a container so that marquee doesn't break -->

@ -107,7 +107,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_change_repeat"
-                app:icon="@drawable/ic_repeat"
+                app:icon="@drawable/ic_repeat_24"
                app:iconTint="@color/sel_accented"
                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
                app:layout_constraintStart_toStartOf="parent"
@ -119,7 +119,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_skip_prev"
-                app:icon="@drawable/ic_skip_prev"
+                app:icon="@drawable/ic_skip_prev_24"
                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
                app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
                app:layout_constraintStart_toEndOf="@+id/playback_repeat"
@ -131,12 +131,12 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_play_pause"
-                android:src="@drawable/sel_playing_state"
+                android:src="@drawable/sel_playing_state_24"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_play" />
+                tools:src="@drawable/ic_play_24" />

            <Button
                android:id="@+id/playback_skip_next"
@ -144,7 +144,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_skip_next"
-                app:icon="@drawable/ic_skip_next"
+                app:icon="@drawable/ic_skip_next_24"
                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
                app:layout_constraintEnd_toStartOf="@+id/playback_shuffle"
                app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
@ -156,7 +156,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_shuffle"
-                app:icon="@drawable/ic_shuffle"
+                app:icon="@drawable/ic_shuffle_24"
                app:iconTint="@color/sel_accented"
                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
                app:layout_constraintEnd_toEndOf="parent"
--- a/app/src/main/res/layout-land/item_detail.xml
+++ b/app/src/main/res/layout-land/item_detail.xml
@ -6,13 +6,13 @@
    android:layout_height="match_parent"
    android:padding="@dimen/spacing_medium">

-    <org.oxycblt.auxio.image.ui.StyledImageView
+    <org.oxycblt.auxio.image.StyledImageView
        android:id="@+id/detail_cover"
        style="@style/Widget.Auxio.Image.Large"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        tools:ignore="ContentDescription"
-        tools:staticIcon="@drawable/ic_artist" />
+        tools:staticIcon="@drawable/ic_song_48" />

    <TextView
        android:id="@+id/detail_name"
--- a/app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml
@ -14,7 +14,7 @@
        app:title="@string/lbl_playback"
        tools:subtitle="@string/lbl_all_songs" />

-    <org.oxycblt.auxio.image.ui.StyledImageView
+    <org.oxycblt.auxio.image.StyledImageView
        android:id="@+id/playback_cover"
        style="@style/Widget.Auxio.Image.Full"
        android:layout_margin="@dimen/spacing_mid_large"
@ -23,7 +23,7 @@
        app:layout_constraintHorizontal_bias="0.5"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
-        tools:staticIcon="@drawable/ic_album" />
+        tools:staticIcon="@drawable/ic_song_48" />

    <!-- TextView is wrapped in a container so that marquee doesn't break -->

@ -104,7 +104,7 @@
                android:layout_height="wrap_content"
                android:layout_marginEnd="@dimen/spacing_large"
                android:contentDescription="@string/desc_change_repeat"
-                app:icon="@drawable/ic_repeat"
+                app:icon="@drawable/ic_repeat_24"
                app:iconTint="@color/sel_accented"
                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
                app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
@ -118,7 +118,7 @@
                android:layout_height="wrap_content"
                android:layout_marginEnd="@dimen/spacing_large"
                android:contentDescription="@string/desc_skip_prev"
-                app:icon="@drawable/ic_skip_prev"
+                app:icon="@drawable/ic_skip_prev_24"
                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
                app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
                app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
@ -129,12 +129,12 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_play_pause"
-                android:src="@drawable/sel_playing_state"
+                android:src="@drawable/sel_playing_state_24"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_pause" />
+                tools:src="@drawable/ic_pause_24" />

            <Button
                android:id="@+id/playback_skip_next"
@ -143,7 +143,7 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="@dimen/spacing_large"
                android:contentDescription="@string/desc_skip_next"
-                app:icon="@drawable/ic_skip_next"
+                app:icon="@drawable/ic_skip_next_24"
                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
                app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
                app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
@ -155,7 +155,7 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="@dimen/spacing_large"
                android:contentDescription="@string/desc_shuffle"
-                app:icon="@drawable/ic_shuffle"
+                app:icon="@drawable/ic_shuffle_24"
                app:iconTint="@color/sel_accented"
                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
                app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
--- a/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
@ -6,14 +6,14 @@
    android:layout_height="wrap_content"
    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">

-    <org.oxycblt.auxio.image.ui.StyledImageView
+    <org.oxycblt.auxio.image.StyledImageView
        android:id="@+id/playback_cover"
        style="@style/Widget.Auxio.Image.Medium"
        android:layout_margin="@dimen/spacing_small"
        app:layout_constraintBottom_toTopOf="@+id/playback_progress_container"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:staticIcon="@drawable/ic_album" />
+        tools:staticIcon="@drawable/ic_song_24" />

    <TextView
        android:id="@+id/playback_song"
@ -63,7 +63,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_play_pause"
-                app:icon="@drawable/sel_playing_state" />
+                app:icon="@drawable/sel_playing_state_24" />

            <Button
                android:id="@+id/playback_skip_next"
@ -71,7 +71,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_play_pause"
-                app:icon="@drawable/ic_skip_next" />
+                app:icon="@drawable/ic_skip_next_24" />
        </LinearLayout>

    </org.oxycblt.auxio.playback.NoRtlFrameLayout>
--- a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
@ -15,7 +15,7 @@
        app:title="@string/lbl_playback"
        tools:subtitle="@string/lbl_all_songs" />

-    <org.oxycblt.auxio.image.ui.StyledImageView
+    <org.oxycblt.auxio.image.StyledImageView
        android:id="@+id/playback_cover"
        style="@style/Widget.Auxio.Image.Full"
        android:layout_margin="@dimen/spacing_mid_large"
@ -23,7 +23,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
-        tools:staticIcon="@drawable/ic_album" />
+        tools:staticIcon="@drawable/ic_song_48" />

    <TextView
        android:id="@+id/playback_song"
@ -93,7 +93,7 @@
                android:layout_height="wrap_content"
                android:layout_marginEnd="@dimen/spacing_large"
                android:contentDescription="@string/desc_change_repeat"
-                app:icon="@drawable/ic_repeat"
+                app:icon="@drawable/ic_repeat_24"
                app:iconTint="@color/sel_accented"
                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
                app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
@ -107,7 +107,7 @@
                android:layout_height="wrap_content"
                android:layout_marginEnd="@dimen/spacing_large"
                android:contentDescription="@string/desc_skip_prev"
-                app:icon="@drawable/ic_skip_prev"
+                app:icon="@drawable/ic_skip_prev_24"
                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
                app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
                app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
@ -118,12 +118,12 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/desc_play_pause"
-                android:src="@drawable/sel_playing_state"
+                android:src="@drawable/sel_playing_state_24"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@drawable/ic_pause" />
+                tools:src="@drawable/ic_pause_24" />

            <Button
                android:id="@+id/playback_skip_next"
@ -132,7 +132,7 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="@dimen/spacing_large"
                android:contentDescription="@string/desc_skip_next"
-                app:icon="@drawable/ic_skip_next"
+                app:icon="@drawable/ic_skip_next_24"
                app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
                app:layout_constraintStart_toEndOf="@+id/playback_play_pause"
                app:layout_constraintTop_toTopOf="@+id/playback_play_pause" />
@ -144,7 +144,7 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="@dimen/spacing_large"
                android:contentDescription="@string/desc_shuffle"
-                app:icon="@drawable/ic_shuffle"
+                app:icon="@drawable/ic_shuffle_24"
                app:iconTint="@color/sel_accented"
                app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
                app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
--- a/Show more
+++ b/Show more