diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
index b536909fa6..12ba91ed65 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
@@ -32,7 +32,7 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
         }
     }
 
-    override fun getLogo() = R.drawable.tracker_anilist
+    override fun getLogo() = R.drawable.ic_tracker_anilist
 
     override fun getLogoColor() = Color.rgb(18, 25, 35)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
index c75cac8e27..72e69bf80b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
@@ -68,9 +68,9 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
         return track
     }
 
-    override fun getLogo() = R.drawable.tracker_bangumi
+    override fun getLogo() = R.drawable.ic_tracker_bangumi
 
-    override fun getLogoColor() = Color.rgb(0xF0, 0x91, 0x99)
+    override fun getLogoColor() = Color.rgb(240, 145, 153)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
index f1993860e3..5a055380ff 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
@@ -33,7 +33,7 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
     private val api by lazy { KitsuApi(client, interceptor) }
 
     override fun getLogo(): Int {
-        return R.drawable.tracker_kitsu
+        return R.drawable.ic_tracker_kitsu
     }
 
     override fun getLogoColor(): Int {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
index e55ca8c7f9..9e235a2780 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
@@ -17,7 +17,7 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
 
     override val name = "MyAnimeList"
 
-    override fun getLogo() = R.drawable.tracker_mal
+    override fun getLogo() = R.drawable.ic_tracker_mal
 
     override fun getLogoColor() = Color.rgb(46, 81, 162)
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
index 5ebd356cae..1c6b3e5cdf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
@@ -19,7 +19,7 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
 
     private val api by lazy { ShikimoriApi(client, interceptor) }
 
-    override fun getLogo() = R.drawable.tracker_shikimori
+    override fun getLogo() = R.drawable.ic_tracker_shikimori
 
     override fun getLogoColor() = Color.rgb(40, 40, 40)
 
diff --git a/app/src/main/res/drawable-hdpi/tachiyomi_circle.webp b/app/src/main/res/drawable-hdpi/tachiyomi_circle.webp
deleted file mode 100644
index 0ec2f7bbe8..0000000000
Binary files a/app/src/main/res/drawable-hdpi/tachiyomi_circle.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/tachiyomi_circle.webp b/app/src/main/res/drawable-mdpi/tachiyomi_circle.webp
deleted file mode 100644
index ab4db0b7b8..0000000000
Binary files a/app/src/main/res/drawable-mdpi/tachiyomi_circle.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/tachiyomi_circle.webp b/app/src/main/res/drawable-xhdpi/tachiyomi_circle.webp
deleted file mode 100644
index 9c2fcfabdd..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/tachiyomi_circle.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/tachiyomi_circle.webp b/app/src/main/res/drawable-xxhdpi/tachiyomi_circle.webp
deleted file mode 100644
index c5e2b696b5..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/tachiyomi_circle.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/tracker_anilist.webp b/app/src/main/res/drawable-xxxhdpi/ic_tracker_anilist.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/tracker_anilist.webp
rename to app/src/main/res/drawable-xxxhdpi/ic_tracker_anilist.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tracker_bangumi.webp b/app/src/main/res/drawable-xxxhdpi/ic_tracker_bangumi.webp
new file mode 100644
index 0000000000..26b1d4e963
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_tracker_bangumi.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/tracker_kitsu.webp b/app/src/main/res/drawable-xxxhdpi/ic_tracker_kitsu.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/tracker_kitsu.webp
rename to app/src/main/res/drawable-xxxhdpi/ic_tracker_kitsu.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/tracker_mal.webp b/app/src/main/res/drawable-xxxhdpi/ic_tracker_mal.webp
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/tracker_mal.webp
rename to app/src/main/res/drawable-xxxhdpi/ic_tracker_mal.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tracker_shikimori.webp b/app/src/main/res/drawable-xxxhdpi/ic_tracker_shikimori.webp
new file mode 100644
index 0000000000..f08ce3839f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_tracker_shikimori.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/tachiyomi_circle.webp b/app/src/main/res/drawable-xxxhdpi/tachiyomi_circle.webp
deleted file mode 100644
index 74705a6722..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/tachiyomi_circle.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/tracker_bangumi.webp b/app/src/main/res/drawable-xxxhdpi/tracker_bangumi.webp
deleted file mode 100644
index 779ab9af7d..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/tracker_bangumi.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/tracker_shikimori.webp b/app/src/main/res/drawable-xxxhdpi/tracker_shikimori.webp
deleted file mode 100644
index d9cf1706fa..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/tracker_shikimori.webp and /dev/null differ
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
deleted file mode 100644
index 77dfc77507..0000000000
--- a/app/src/main/res/layout/navigation_header.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/navigation_drawer_header_height"
-    android:gravity="bottom"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/drawerColor" />
-
-    <ImageView
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="@dimen/navigation_drawer_header_margin"
-        android:scaleType="centerCrop"
-        android:src="@drawable/tachiyomi_circle" />
-
-</FrameLayout>
diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml
index 2a60d51f49..5810e54924 100644
--- a/app/src/main/res/layout/track_item.xml
+++ b/app/src/main/res/layout/track_item.xml
@@ -34,7 +34,7 @@
                 android:contentDescription="@string/tracking"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                tools:src="@drawable/tracker_mal" />
+                tools:src="@drawable/ic_tracker_mal" />
 
             <ProgressBar
                 android:id="@+id/progress"