Refactor use of attrs to tint images

2025-04-14 16:37:16 +03:00 · 2022-07-12 13:00:03 +00:00 · 2022-07-12 13:00:03 +00:00 · 9bf6cabfbc
commit 9bf6cabfbc
parent 9c637e6f69
168 changed files with 507 additions and 1341 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
-</project>
--- a/ultrasonic/lint-baseline.xml
+++ b/ultrasonic/lint-baseline.xml
@ -158,6 +158,39 @@
            column="1"/>
    </issue>

+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_create_new_folder` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_create_new_folder.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_drag_queue` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_drag_queue.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_folder` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_folder.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
    <issue
        id="UnusedResources"
        message="The resource `R.drawable.ic_menu_arrow` appears to be unused"
@ -169,6 +202,72 @@
            column="1"/>
    </issue>

+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_menu_backward` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_menu_backward.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_menu_close` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_menu_close.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_menu_forward` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_menu_forward.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_menu_help` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_menu_help.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_sd_storage` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_sd_storage.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.drawable.ic_subdirectory_up` appears to be unused"
+        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
+        errorLine2="^">
+        <location
+            file="src/main/res/drawable/ic_subdirectory_up.xml"
+            line="1"
+            column="1"/>
+    </issue>
+
    <issue
        id="UnusedResources"
        message="The resource `R.drawable.media3_notification_pause` appears to be unused"
@ -224,15 +323,6 @@
            column="1"/>
    </issue>

-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: list_pressed_holo_dark.9.png, list_pressed_holo_light.9.png">
-        <location
-            file="src/main/res/drawable-hdpi/list_pressed_holo_light.9.png"/>
-        <location
-            file="src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png"/>
-    </issue>
-
    <issue
        id="Autofill"
        message="Missing `autofillHints` attribute"
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt
@ -249,10 +249,10 @@ class NavigationActivity : AppCompatActivity() {

        if (activeServer.index == 0)
            selectServerButton?.icon =
-                ContextCompat.getDrawable(this, R.drawable.ic_menu_screen_on_off_dark)
+                ContextCompat.getDrawable(this, R.drawable.ic_menu_screen_on_off)
        else
            selectServerButton?.icon =
-                ContextCompat.getDrawable(this, R.drawable.ic_menu_select_server_dark)
+                ContextCompat.getDrawable(this, R.drawable.ic_menu_select_server)

        selectServerButton?.iconTint = ColorStateList.valueOf(foregroundColor)
        selectServerButton?.setTextColor(foregroundColor)
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/AlbumRowBinder.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/AlbumRowBinder.kt
@ -7,8 +7,6 @@

 package org.moire.ultrasonic.adapters

-import android.content.Context
-import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@ -24,7 +22,6 @@ import org.moire.ultrasonic.domain.Album
 import org.moire.ultrasonic.imageloader.ImageLoader
 import org.moire.ultrasonic.service.MusicServiceFactory.getMusicService
 import org.moire.ultrasonic.util.Settings.shouldUseId3Tags
-import org.moire.ultrasonic.util.Util
 import timber.log.Timber

 /**
@ -33,18 +30,14 @@ import timber.log.Timber
 class AlbumRowBinder(
    val onItemClick: (Album) -> Unit,
    val onContextMenuClick: (MenuItem, Album) -> Boolean,
-    private val imageLoader: ImageLoader,
-    context: Context
+    private val imageLoader: ImageLoader
 ) : ItemViewBinder<Album, AlbumRowBinder.ViewHolder>(), KoinComponent {

-    private val starDrawable: Drawable =
-        Util.getDrawableFromAttribute(context, R.attr.star_full)
-    private val starHollowDrawable: Drawable =
-        Util.getDrawableFromAttribute(context, R.attr.star_hollow)
+    private val starDrawable: Int = R.drawable.ic_star_full
+    private val starHollowDrawable: Int = R.drawable.ic_star_hollow

    // Set our layout files
    val layout = R.layout.list_item_album
-    val contextMenuLayout = R.menu.context_menu_artist

    override fun onBindViewHolder(holder: ViewHolder, item: Album) {
        holder.album.text = item.title
@ -60,7 +53,7 @@ class AlbumRowBinder(
            true
        }
        holder.coverArtId = item.coverArt
-        holder.star.setImageDrawable(if (item.starred) starDrawable else starHollowDrawable)
+        holder.star.setImageResource(if (item.starred) starDrawable else starHollowDrawable)
        holder.star.setOnClickListener { onStarClick(item, holder.star) }

        imageLoader.loadImage(
@ -88,7 +81,7 @@ class AlbumRowBinder(
     */
    private fun onStarClick(entry: Album, star: ImageView) {
        entry.starred = !entry.starred
-        star.setImageDrawable(if (entry.starred) starDrawable else starHollowDrawable)
+        star.setImageResource(if (entry.starred) starDrawable else starHollowDrawable)
        val musicService = getMusicService()
        Thread {
            val useId3 = shouldUseId3Tags
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ServerRowAdapter.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/ServerRowAdapter.kt
@ -19,7 +19,6 @@ import org.moire.ultrasonic.data.ActiveServerProvider
 import org.moire.ultrasonic.data.ServerSetting
 import org.moire.ultrasonic.model.ServerSettingsModel
 import org.moire.ultrasonic.util.ServerColor
-import org.moire.ultrasonic.util.Util

 /**
 * Row Adapter to be used in the Server List
@ -108,14 +107,13 @@ internal class ServerRowAdapter(
        // Configure icons for the row
        if (setting?.id == ActiveServerProvider.OFFLINE_DB_ID) {
            serverMenu?.visibility = View.INVISIBLE
-            icon = Util.getDrawableFromAttribute(context, R.attr.screen_on_off)
+            icon = ContextCompat.getDrawable(context, R.drawable.ic_menu_screen_on_off)
            background = ContextCompat.getDrawable(context, R.drawable.circle)
        } else {
-            icon = ContextCompat.getDrawable(context, R.drawable.ic_menu_server_dark)
+            icon = ContextCompat.getDrawable(context, R.drawable.ic_menu_server)
            background = ContextCompat.getDrawable(context, R.drawable.circle)
        }

-        // Set colors
        icon?.setTint(ServerColor.getForegroundColor(context, setting?.color))
        background?.setTint(ServerColor.getBackgroundColor(context, setting?.color))

--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt
@ -30,7 +30,7 @@ import timber.log.Timber
 class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable, KoinComponent {

    var check: CheckedTextView = view.findViewById(R.id.song_check)
-    private var rating: LinearLayout = view.findViewById(R.id.song_rating)
+    private var rating: LinearLayout = view.findViewById(R.id.song_five_star)
    private var fiveStar1: ImageView = view.findViewById(R.id.song_five_star_1)
    private var fiveStar2: ImageView = view.findViewById(R.id.song_five_star_2)
    private var fiveStar3: ImageView = view.findViewById(R.id.song_five_star_3)
@ -134,7 +134,7 @@ class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable
    private fun setupStarButtons(song: Track, useFiveStarRating: Boolean) {
        if (useFiveStarRating) {
            // Hide single star
-            star.isVisible = false
+            star.visibility = View.INVISIBLE
            val rating = if (song.userRating == null) 0 else song.userRating!!
            setFiveStars(rating)
        } else {
@ -147,10 +147,10 @@ class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable
                val id = song.id

                if (!isStarred) {
-                    star.setImageDrawable(imageHelper.starDrawable)
+                    star.setImageResource(R.drawable.ic_star_full)
                    song.starred = true
                } else {
-                    star.setImageDrawable(imageHelper.starHollowDrawable)
+                    star.setImageResource(R.drawable.ic_star_hollow)
                    song.starred = false
                }

@ -173,32 +173,28 @@ class TrackViewHolder(val view: View) : RecyclerView.ViewHolder(view), Checkable

    @Suppress("MagicNumber")
    private fun setFiveStars(rating: Int) {
-        fiveStar1.setImageDrawable(
-            if (rating > 0) imageHelper.starDrawable else imageHelper.starHollowDrawable
+        fiveStar1.setImageResource(
+            if (rating > 0) R.drawable.ic_star_full else R.drawable.ic_star_hollow
        )
-        fiveStar2.setImageDrawable(
-            if (rating > 1) imageHelper.starDrawable else imageHelper.starHollowDrawable
+        fiveStar2.setImageResource(
+            if (rating > 1) R.drawable.ic_star_full else R.drawable.ic_star_hollow
        )
-        fiveStar3.setImageDrawable(
-            if (rating > 2) imageHelper.starDrawable else imageHelper.starHollowDrawable
+        fiveStar3.setImageResource(
+            if (rating > 2) R.drawable.ic_star_full else R.drawable.ic_star_hollow
        )
-        fiveStar4.setImageDrawable(
-            if (rating > 3) imageHelper.starDrawable else imageHelper.starHollowDrawable
+        fiveStar4.setImageResource(
+            if (rating > 3) R.drawable.ic_star_full else R.drawable.ic_star_hollow
        )
-        fiveStar5.setImageDrawable(
-            if (rating > 4) imageHelper.starDrawable else imageHelper.starHollowDrawable
+        fiveStar5.setImageResource(
+            if (rating > 4) R.drawable.ic_star_full else R.drawable.ic_star_hollow
        )
    }

    private fun setSingleStar(starred: Boolean) {
        if (starred) {
-            if (star.drawable !== imageHelper.starDrawable) {
-                star.setImageDrawable(imageHelper.starDrawable)
-            }
+            star.setImageResource(R.drawable.ic_star_full)
        } else {
-            if (star.drawable !== imageHelper.starHollowDrawable) {
-                star.setImageDrawable(imageHelper.starHollowDrawable)
-            }
+            star.setImageResource(R.drawable.ic_star_hollow)
        }
    }

--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Utils.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Utils.kt
@ -5,11 +5,11 @@ import android.graphics.drawable.Drawable
 import android.view.MenuInflater
 import android.view.View
 import android.widget.PopupMenu
+import androidx.core.content.ContextCompat
 import org.moire.ultrasonic.R
 import org.moire.ultrasonic.data.ActiveServerProvider
 import org.moire.ultrasonic.domain.Identifiable
 import org.moire.ultrasonic.util.Settings
-import org.moire.ultrasonic.util.Util

 object Utils {
    @JvmStatic
@ -37,8 +37,6 @@ object Utils {
    class ImageHelper(context: Context) {

        lateinit var errorImage: Drawable
-        lateinit var starHollowDrawable: Drawable
-        lateinit var starDrawable: Drawable
        lateinit var pinImage: Drawable
        lateinit var downloadedImage: Drawable
        lateinit var downloadingImage: Drawable
@ -61,13 +59,11 @@ object Utils {
        }

        private fun getDrawables(context: Context) {
-            starHollowDrawable = Util.getDrawableFromAttribute(context, R.attr.star_hollow)
-            starDrawable = Util.getDrawableFromAttribute(context, R.attr.star_full)
-            pinImage = Util.getDrawableFromAttribute(context, R.attr.pin)
-            downloadedImage = Util.getDrawableFromAttribute(context, R.attr.downloaded)
-            errorImage = Util.getDrawableFromAttribute(context, R.attr.error)
-            downloadingImage = Util.getDrawableFromAttribute(context, R.attr.downloading)
-            playingImage = Util.getDrawableFromAttribute(context, R.attr.media_play_small)
+            pinImage = ContextCompat.getDrawable(context, R.drawable.ic_menu_pin)!!
+            downloadedImage = ContextCompat.getDrawable(context, R.drawable.ic_menu_download)!!
+            errorImage = ContextCompat.getDrawable(context, R.drawable.ic_baseline_error)!!
+            downloadingImage = ContextCompat.getDrawable(context, R.drawable.stat_sys_download)!!
+            playingImage = ContextCompat.getDrawable(context, R.drawable.ic_stat_play)!!
        }
    }

--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt
@ -1,6 +1,7 @@
 package org.moire.ultrasonic.app

 import android.content.Context
+import android.os.StrictMode
 import androidx.multidex.MultiDexApplication
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@ -31,8 +32,8 @@ class UApp : MultiDexApplication() {

    init {
        instance = this
-//        if (BuildConfig.DEBUG)
-//            StrictMode.enableDefaults()
+        if (BuildConfig.DEBUG)
+            StrictMode.enableDefaults()
    }

    var initiated = false
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt
@ -75,8 +75,7 @@ class AlbumListFragment : EntryListFragment<Album>() {
            AlbumRowBinder(
                { entry -> onItemClick(entry) },
                { menuItem, entry -> onContextMenuItemSelected(menuItem, entry) },
-                imageLoaderProvider.getImageLoader(),
-                context = requireContext()
+                imageLoaderProvider.getImageLoader()
            )
        )

--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/NowPlayingFragment.kt
@ -28,7 +28,6 @@ import org.moire.ultrasonic.subsonic.ImageLoaderProvider
 import org.moire.ultrasonic.util.Constants
 import org.moire.ultrasonic.util.Settings
 import org.moire.ultrasonic.util.Util.applyTheme
-import org.moire.ultrasonic.util.Util.getDrawableFromAttribute
 import org.moire.ultrasonic.util.Util.getNotificationImageSize
 import timber.log.Timber

@ -85,17 +84,9 @@ class NowPlayingFragment : Fragment() {
    private fun update() {
        try {
            if (mediaPlayerController.isPlaying) {
-                playButton!!.setImageDrawable(
-                    getDrawableFromAttribute(
-                        requireContext(), R.attr.media_pause
-                    )
-                )
+                playButton!!.setImageResource(R.drawable.media_pause_normal)
            } else {
-                playButton!!.setImageDrawable(
-                    getDrawableFromAttribute(
-                        requireContext(), R.attr.media_play
-                    )
-                )
+                playButton!!.setImageResource(R.drawable.media_start_normal)
            }

            val file = mediaPlayerController.currentPlayingLegacy
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
@ -10,7 +10,6 @@ package org.moire.ultrasonic.fragment
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.graphics.Point
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@ -156,9 +155,9 @@ class PlayerFragment :
    private lateinit var playButton: View
    private lateinit var shuffleButton: View
    private lateinit var repeatButton: ImageView
-    private lateinit var hollowStar: Drawable
-    private lateinit var fullStar: Drawable
    private lateinit var progressBar: SeekBar
+    private val hollowStar = R.drawable.ic_star_hollow
+    private val fullStar = R.drawable.ic_star_full

    internal val viewAdapter: BaseAdapter<Identifiable> by lazy {
        BaseAdapter()
@ -231,8 +230,6 @@ class PlayerFragment :

        val ratingLinearLayout = view.findViewById<LinearLayout>(R.id.song_rating)
        if (!useFiveStarRating) ratingLinearLayout.isVisible = false
-        hollowStar = Util.getDrawableFromAttribute(view.context, R.attr.star_hollow)
-        fullStar = Util.getDrawableFromAttribute(view.context, R.attr.star_full)

        fiveStar1ImageView.setOnClickListener { setSongRating(1) }
        fiveStar2ImageView.setOnClickListener { setSongRating(2) }
@ -441,27 +438,15 @@ class PlayerFragment :
    private fun updateRepeatButtonState(repeatMode: Int) {
        when (repeatMode) {
            0 -> {
-                repeatButton.setImageDrawable(
-                    Util.getDrawableFromAttribute(
-                        requireContext(), R.attr.media_repeat_off
-                    )
-                )
+                repeatButton.setImageResource(R.drawable.media_repeat_off)
                repeatButton.alpha = ALPHA_DEACTIVATED
            }
            1 -> {
-                repeatButton.setImageDrawable(
-                    Util.getDrawableFromAttribute(
-                        requireContext(), R.attr.media_repeat_single
-                    )
-                )
+                repeatButton.setImageResource(R.drawable.media_repeat_one)
                repeatButton.alpha = ALPHA_ACTIVATED
            }
            2 -> {
-                repeatButton.setImageDrawable(
-                    Util.getDrawableFromAttribute(
-                        requireContext(), R.attr.media_repeat_all
-                    )
-                )
+                repeatButton.setImageResource(R.drawable.media_repeat_all)
                repeatButton.alpha = ALPHA_ACTIVATED
            }
            else -> {
@ -583,10 +568,10 @@ class PlayerFragment :
        if (useFiveStarRating) starMenuItem.isVisible = false

        if (currentSong != null) {
-            starMenuItem.icon = if (currentSong!!.starred) fullStar else hollowStar
+            starMenuItem.setIcon(if (currentSong!!.starred) fullStar else hollowStar)
            shareSongMenuItem.isVisible = true
        } else {
-            starMenuItem.icon = hollowStar
+            starMenuItem.setIcon(hollowStar)
            shareSongMenuItem.isVisible = false
        }

@ -761,10 +746,10 @@ class PlayerFragment :
                        object : FutureCallback<SessionResult> {
                            override fun onSuccess(result: SessionResult?) {
                                if (isStarred) {
-                                    starMenuItem.icon = hollowStar
+                                    starMenuItem.setIcon(hollowStar)
                                    currentSong!!.starred = false
                                } else {
-                                    starMenuItem.icon = fullStar
+                                    starMenuItem.setIcon(fullStar)
                                    currentSong!!.starred = true
                                }
                            }
@ -1227,11 +1212,11 @@ class PlayerFragment :
            rating = currentSong!!.userRating!!
        }

-        fiveStar1ImageView.setImageDrawable(if (rating > 0) fullStar else hollowStar)
-        fiveStar2ImageView.setImageDrawable(if (rating > 1) fullStar else hollowStar)
-        fiveStar3ImageView.setImageDrawable(if (rating > 2) fullStar else hollowStar)
-        fiveStar4ImageView.setImageDrawable(if (rating > 3) fullStar else hollowStar)
-        fiveStar5ImageView.setImageDrawable(if (rating > 4) fullStar else hollowStar)
+        fiveStar1ImageView.setImageResource(if (rating > 0) fullStar else hollowStar)
+        fiveStar2ImageView.setImageResource(if (rating > 1) fullStar else hollowStar)
+        fiveStar3ImageView.setImageResource(if (rating > 2) fullStar else hollowStar)
+        fiveStar4ImageView.setImageResource(if (rating > 3) fullStar else hollowStar)
+        fiveStar5ImageView.setImageResource(if (rating > 4) fullStar else hollowStar)
    }

    private fun setSongRating(rating: Int) {
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt
@ -102,8 +102,7 @@ class SearchFragment : MultiListFragment<Identifiable>(), KoinComponent {
            AlbumRowBinder(
                onItemClick = ::onItemClick,
                onContextMenuClick = ::onContextMenuItemSelected,
-                imageLoader = imageLoaderProvider.getImageLoader(),
-                context = requireContext()
+                imageLoader = imageLoaderProvider.getImageLoader()
            )
        )

--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
@ -137,8 +137,7 @@ open class TrackCollectionFragment : MultiListFragment<MusicDirectory.Child>() {
            AlbumRowBinder(
                { entry -> onItemClick(entry) },
                { menuItem, entry -> onContextMenuItemSelected(menuItem, entry) },
-                imageLoaderProvider.getImageLoader(),
-                context = requireContext()
+                imageLoaderProvider.getImageLoader()
            )
        )

--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/MediaNotificationProvider.kt
@ -57,8 +57,8 @@ class MediaNotificationProvider(context: Context) :
                CommandButton.Builder()
                    .setDisplayName("Love")
                    .setIconResId(
-                        if (rating.isHeart) R.drawable.ic_star_full_dark
-                        else R.drawable.ic_star_hollow_dark
+                        if (rating.isHeart) R.drawable.ic_star_full
+                        else R.drawable.ic_star_hollow
                    )
                    .setSessionCommand(
                        SessionCommand(
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt
@ -133,9 +133,9 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() {

        // Set correct drawable for pause state
        if (playing) {
-            views.setImageViewResource(R.id.control_play, R.drawable.media_pause_normal_dark)
+            views.setImageViewResource(R.id.control_play, R.drawable.media_pause_normal)
        } else {
-            views.setImageViewResource(R.id.control_play, R.drawable.media_start_normal_dark)
+            views.setImageViewResource(R.id.control_play, R.drawable.media_start_normal)
        }

        // Set the cover art
--- a/ultrasonic/src/main/res/drawable-hdpi/list_focused_holo.9.png
+++ b/ultrasonic/src/main/res/drawable-hdpi/list_focused_holo.9.png
--- a/ultrasonic/src/main/res/drawable-hdpi/list_longpressed_holo.9.png
+++ b/ultrasonic/src/main/res/drawable-hdpi/list_longpressed_holo.9.png
--- a/ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png
+++ b/ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png
--- a/ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_light.9.png
+++ b/ultrasonic/src/main/res/drawable-hdpi/list_pressed_holo_light.9.png
--- a/ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
+++ b/ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
--- a/ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_light.9.png
+++ b/ultrasonic/src/main/res/drawable-hdpi/list_selector_disabled_holo_light.9.png
--- a/ultrasonic/src/main/res/drawable/btn_check_custom_dark.xml
+++ b/ultrasonic/src/main/res/drawable/btn_check_custom_dark.xml
@ -17,12 +17,12 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_checked="true"
-          android:drawable="@drawable/btn_check_on_dark" />
+          android:drawable="@drawable/btn_check_on" />

    <item android:state_checked="false"
-          android:drawable="@drawable/btn_check_off_dark" />
+          android:drawable="@drawable/btn_check_off" />

    <item
-        android:drawable="@drawable/btn_check_off_dark" />
+        android:drawable="@drawable/btn_check_off" />

 </selector>
--- a/ultrasonic/src/main/res/drawable/btn_check_custom_light.xml
+++ b/ultrasonic/src/main/res/drawable/btn_check_custom_light.xml
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true"
-          android:drawable="@drawable/btn_check_on_light" />
-
-    <item android:state_checked="false"
-          android:drawable="@drawable/btn_check_off_light" />
-        
-    <item
-        android:drawable="@drawable/btn_check_off_light" />
-
-</selector>
--- a/ultrasonic/src/main/res/drawable/btn_check_off_dark.xml
+++ b/ultrasonic/src/main/res/drawable/btn_check_off_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
--- a/ultrasonic/src/main/res/drawable/btn_check_off_light.xml
+++ b/ultrasonic/src/main/res/drawable/btn_check_off_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/btn_check_on_dark.xml
+++ b/ultrasonic/src/main/res/drawable/btn_check_on_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
--- a/ultrasonic/src/main/res/drawable/btn_check_on_light.xml
+++ b/ultrasonic/src/main/res/drawable/btn_check_on_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_baseline_error_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_baseline_error_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <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,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
--- a/ultrasonic/src/main/res/drawable/ic_baseline_error_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_baseline_error_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_create_new_folder_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_create_new_folder_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
    <path
        android:fillColor="#FFF"
        android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_create_new_folder_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_create_new_folder_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_drag_queue_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_drag_queue_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
--- a/ultrasonic/src/main/res/drawable/ic_drag_queue_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_drag_queue_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_folder_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_folder_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
    <path
        android:fillColor="#FFF"
        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_folder_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_folder_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_about_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_about_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_about_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_about_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_backward_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_backward_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_backward_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_backward_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_bookmark_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_bookmark_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_bookmark_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_bookmark_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_browse_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_browse_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,7h-3v5.5c0,1.38 -1.12,2.5 -2.5,2.5S10,13.88 10,12.5s1.12,-2.5 2.5,-2.5c0.57,0 1.08,0.19 1.5,0.51L14,5h4v2zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_browse_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_browse_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,7h-3v5.5c0,1.38 -1.12,2.5 -2.5,2.5S10,13.88 10,12.5s1.12,-2.5 2.5,-2.5c0.57,0 1.08,0.19 1.5,0.51L14,5h4v2zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_chat_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_chat_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_chat_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_chat_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_chat_send_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_chat_send_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_chat_send_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_chat_send_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_close_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_close_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      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,12z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_close_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_close_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      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,12z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_download_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_download_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_exit_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_exit_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_exit_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_exit_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_forward_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_forward_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_forward_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_forward_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_help_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_help_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_help_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_help_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_home_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_home_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_home_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_home_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_pin_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_pin_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
    <path
        android:fillColor="#FFF"
        android:pathData="M7 2h10v2l-2 1v5l3 3v3h-5v4l-1 3l-1-3v-4H6v-3l3-3V5L7 4z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_pin_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_pin_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-        android:pathData="M7 2h10v2l-2 1v5l3 3v3h-5v4l-1 3l-1-3v-4H6v-3l3-3V5L7 4z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_playlists_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_playlists_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M4,10h12v2L4,12zM4,6h12v2L4,8zM4,14h8v2L4,16zM14,14v6l5,-3z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_playlists_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_playlists_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M4,10h12v2L4,12zM4,6h12v2L4,8zM4,14h8v2L4,16zM14,14v6l5,-3z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_podcasts_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_podcasts_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_podcasts_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_podcasts_light.xml
@ -1,12 +0,0 @@
-<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="#000"
-      android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/>
-  <path
-      android:fillColor="#000"
-      android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_refresh_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_refresh_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_refresh_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_refresh_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_remove_all_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_remove_all_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_remove_all_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_remove_all_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_save_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_save_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_save_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_save_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M16,1L8,1C6.34,1 5,2.34 5,4v16c0,1.66 1.34,3 3,3h8c1.66,0 3,-1.34 3,-3L19,4c0,-1.66 -1.34,-3 -3,-3zM14,21h-4v-1h4v1zM17.25,18L6.75,18L6.75,4h10.5v14z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_screen_on_off_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M16,1L8,1C6.34,1 5,2.34 5,4v16c0,1.66 1.34,3 3,3h8c1.66,0 3,-1.34 3,-3L19,4c0,-1.66 -1.34,-3 -3,-3zM14,21h-4v-1h4v1zM17.25,18L6.75,18L6.75,4h10.5v14z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_search_holo_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_search_holo_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      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"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_search_holo_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_search_holo_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      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/ultrasonic/src/main/res/drawable/ic_menu_select_all_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_select_all_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_select_all_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_select_all_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_select_folder_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_select_folder_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_select_folder_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_select_folder_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_select_server_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_select_server_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_select_server_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_select_server_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_server_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_server_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M12,7L12,3L2,3v18h20L22,7L12,7zM6,19L4,19v-2h2v2zM6,15L4,15v-2h2v2zM6,11L4,11L4,9h2v2zM6,7L4,7L4,5h2v2zM10,19L8,19v-2h2v2zM10,15L8,15v-2h2v2zM10,11L8,11L8,9h2v2zM10,7L8,7L8,5h2v2zM20,19h-8v-2h2v-2h-2v-2h2v-2h-2L12,9h8v10zM18,11h-2v2h2v-2zM18,15h-2v2h2v-2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_settings_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_settings_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_settings_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_settings_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_share_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_share_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_share_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_share_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_menu_unpin_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_unpin_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
    <path
        android:fillColor="#FFF"
        android:pathData="M7 2h10v2l-2 1v5l3 3v3h-5v4l-1 3-1 -3V16H6V13L9 10V5L7 4Zm6 2h-2v6.828l-3 3V14h8v-0.172l-3 -3z"/>
--- a/ultrasonic/src/main/res/drawable/ic_menu_unpin_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_menu_unpin_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-        android:pathData="M7 2h10v2l-2 1v5l3 3v3h-5v4l-1 3-1 -3V16H6V13L9 10V5L7 4Zm6 2h-2v6.828l-3 3V14h8v-0.172l-3 -3z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_more_vert_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_more_vert_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
--- a/ultrasonic/src/main/res/drawable/ic_more_vert_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_more_vert_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_sd_storage_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_sd_storage_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/>
--- a/ultrasonic/src/main/res/drawable/ic_sd_storage_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_sd_storage_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_star_full_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_star_full_dark.xml
@ -2,8 +2,9 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
-      android:fillColor="#DDD"
+      android:fillColor="#FFF"
      android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
--- a/ultrasonic/src/main/res/drawable/ic_star_full_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_star_full_light.xml
@ -1,9 +0,0 @@
-<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="#222"
-      android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_star_hollow_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_star_hollow_dark.xml
@ -2,8 +2,9 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
-      android:fillColor="#DDD"
+      android:fillColor="#FFF"
      android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>
--- a/ultrasonic/src/main/res/drawable/ic_star_hollow_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_star_hollow_light.xml
@ -1,9 +0,0 @@
-<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="#222"
-      android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/media_start_normal_dark.xml
+++ b/ultrasonic/src/main/res/drawable/media_start_normal_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M8,5v14l11,-7z"/>
--- a/ultrasonic/src/main/res/drawable/ic_stat_play_light.xml
+++ b/ultrasonic/src/main/res/drawable/ic_stat_play_light.xml
@ -1,9 +0,0 @@
-<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="#000"
-      android:pathData="M8,5v14l11,-7z"/>
-</vector>
--- a/ultrasonic/src/main/res/drawable/ic_subdirectory_up_dark.xml
+++ b/ultrasonic/src/main/res/drawable/ic_subdirectory_up_dark.xml
@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFF"
      android:pathData="M 16,11 14.58,12.42 11,8.83 V 18 h 10 v 2 H 9 V 8.83 L 5.42,12.42 4,11 10,5 Z"/>
--- a/Show More
+++ b/Show More