diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts
index ef29b6518a..469fbe8675 100644
--- a/Jetcaster/mobile/build.gradle.kts
+++ b/Jetcaster/mobile/build.gradle.kts
@@ -119,7 +119,6 @@ dependencies {
     // Compose
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.foundation)
-    implementation(libs.androidx.compose.material.iconsExtended)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.layout)
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
index 79e6f9095e..15675e8a39 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
@@ -38,10 +38,6 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountCircle
-import androidx.compose.material.icons.filled.LibraryMusic
-import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonColors
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -338,13 +334,13 @@ private fun HomeAppBar(isExpanded: Boolean, modifier: Modifier = Modifier) {
                     },
                     leadingIcon = {
                         Icon(
-                            imageVector = Icons.Default.Search,
+                            painterResource(id = R.drawable.ic_search),
                             contentDescription = null,
                         )
                     },
                     trailingIcon = {
                         Icon(
-                            imageVector = Icons.Default.AccountCircle,
+                            painterResource(id = R.drawable.ic_account_circle),
                             contentDescription = stringResource(R.string.cd_account),
                         )
                     },
@@ -492,7 +488,7 @@ fun PillToolbar(selectedHomeCategory: HomeCategory, onHomeAction: (HomeAction) -
             ) {
                 Row(Modifier) {
                     Icon(
-                        Icons.Filled.LibraryMusic,
+                        painterResource(id = R.drawable.ic_library_music),
                         modifier = Modifier.padding(end = 8.dp),
                         contentDescription = stringResource(
                             R.string.library_toolbar_content_description,
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt
index 45011d4fe8..d4116c4ff5 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt
@@ -24,8 +24,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
@@ -35,6 +33,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.example.jetcaster.R
@@ -122,7 +121,7 @@ private fun ChoiceChipContent(text: String, selected: Boolean, onClick: () -> Un
         leadingIcon = {
             if (selected) {
                 Icon(
-                    imageVector = Icons.Default.Check,
+                    painter = painterResource(id = R.drawable.ic_check),
                     contentDescription = stringResource(id = R.string.cd_selected_category),
                     modifier = Modifier.height(18.dp),
                 )
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt
index fcbe58bd16..77536537fd 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt
@@ -50,16 +50,6 @@ import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.rounded.Forward10
-import androidx.compose.material.icons.rounded.Pause
-import androidx.compose.material.icons.rounded.PlayArrow
-import androidx.compose.material.icons.rounded.Replay10
-import androidx.compose.material.icons.rounded.SkipNext
-import androidx.compose.material.icons.rounded.SkipPrevious
 import androidx.compose.material3.ButtonGroup
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -87,6 +77,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
@@ -586,20 +577,20 @@ private fun TopAppBar(onBackPress: () -> Unit, onAddToQueue: () -> Unit) {
     Row(Modifier.fillMaxWidth()) {
         IconButton(onClick = onBackPress) {
             Icon(
-                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                painterResource(id = R.drawable.ic_arrow_back),
                 contentDescription = stringResource(R.string.cd_back),
             )
         }
         Spacer(Modifier.weight(1f))
         IconButton(onClick = onAddToQueue) {
             Icon(
-                imageVector = Icons.AutoMirrored.Filled.PlaylistAdd,
+                painterResource(id = R.drawable.ic_playlist_add),
                 contentDescription = stringResource(R.string.cd_add),
             )
         }
         IconButton(onClick = { /* TODO */ }) {
             Icon(
-                imageVector = Icons.Default.MoreVert,
+                painterResource(id = R.drawable.ic_more_vert),
                 contentDescription = stringResource(R.string.cd_more),
             )
         }
@@ -755,7 +746,7 @@ private fun PlayerButtons(
                 .height(136.dp),
         ) {
             Icon(
-                imageVector = if (isPlaying) Icons.Rounded.Pause else Icons.Rounded.PlayArrow,
+                painterResource(id = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow),
                 modifier = Modifier.fillMaxSize(),
                 contentDescription = null,
             )
@@ -788,7 +779,7 @@ private fun PlayerButtons(
                         enabled = isPlaying,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.SkipPrevious,
+                            painterResource(id = R.drawable.ic_skip_previous),
                             contentDescription = null,
                         )
                     }
@@ -812,7 +803,7 @@ private fun PlayerButtons(
                         enabled = isPlaying,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.Replay10,
+                            painterResource(id = R.drawable.ic_replay_10),
                             contentDescription = null,
                         )
                     }
@@ -836,7 +827,7 @@ private fun PlayerButtons(
                         enabled = isPlaying,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.Forward10,
+                            painterResource(id = R.drawable.ic_forward_10),
                             contentDescription = null,
                         )
                     }
@@ -860,7 +851,7 @@ private fun PlayerButtons(
                         enabled = hasNext,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.SkipNext,
+                            painterResource(id = R.drawable.ic_skip_next),
                             contentDescription = null,
                         )
                     }
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt
index 7d317ce708..33dcc13ccb 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt
@@ -35,12 +35,6 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.NotificationsActive
-import androidx.compose.material.icons.filled.NotificationsNone
 import androidx.compose.material3.ButtonGroup
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -64,6 +58,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
@@ -323,10 +318,7 @@ fun PodcastDetailsHeaderItemButtons(isSubscribed: Boolean, onClick: () -> Unit,
                     interactionSource = interactionSource1,
                 ) {
                     Icon(
-                        imageVector = if (isSubscribed)
-                            Icons.Default.Check
-                        else
-                            Icons.Default.Add,
+                        painterResource(id = if (isSubscribed) R.drawable.ic_check else R.drawable.ic_add),
                         contentDescription = null,
                     )
                 }
@@ -358,11 +350,7 @@ fun PodcastDetailsHeaderItemButtons(isSubscribed: Boolean, onClick: () -> Unit,
                         .animateWidth(interactionSource = interactionSource2),
                 ) {
                     Icon(
-                        imageVector = if (isNotificationOn) {
-                            Icons.Default.NotificationsActive
-                        } else {
-                            Icons.Default.NotificationsNone
-                        },
+                        painterResource(id = if (isNotificationOn) R.drawable.ic_notifications_active else R.drawable.ic_notifications),
                         contentDescription = stringResource(R.string.cd_more),
                     )
                 }
@@ -384,7 +372,7 @@ fun PodcastDetailsTopAppBar(navigateBack: () -> Unit, modifier: Modifier = Modif
         navigationIcon = {
             IconButton(onClick = navigateBack) {
                 Icon(
-                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                    painterResource(id = R.drawable.ic_arrow_back),
                     contentDescription = stringResource(id = R.string.cd_back),
                 )
             }
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt
index acb2933365..0f9c93b7d4 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt
@@ -27,11 +27,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.rounded.PlayCircleFilled
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -48,6 +43,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.role
@@ -91,7 +87,7 @@ fun EpisodeListItem(
                     .padding(end = 40.dp),
             ) {
                 Icon(
-                    imageVector = Icons.Default.Delete,
+                    painterResource(id = R.drawable.ic_delete),
                     contentDescription = null,
                     modifier = Modifier.align(Alignment.CenterEnd),
                 )
@@ -156,7 +152,7 @@ private fun EpisodeListItemFooter(
         modifier = modifier,
     ) {
         Image(
-            imageVector = Icons.Rounded.PlayCircleFilled,
+            painterResource(id = R.drawable.ic_play_circle),
             contentDescription = stringResource(R.string.cd_play),
             contentScale = ContentScale.Fit,
             colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
@@ -204,7 +200,7 @@ private fun EpisodeListItemFooter(
             },
         ) {
             Icon(
-                imageVector = Icons.AutoMirrored.Filled.PlaylistAdd,
+                painterResource(id = R.drawable.ic_playlist_add),
                 contentDescription = stringResource(R.string.cd_add),
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
             )
@@ -214,7 +210,7 @@ private fun EpisodeListItemFooter(
             onClick = { /* TODO */ },
         ) {
             Icon(
-                imageVector = Icons.Default.MoreVert,
+                painterResource(id = R.drawable.ic_more_vert),
                 contentDescription = stringResource(R.string.cd_more),
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
             )
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Buttons.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Buttons.kt
index a3e1353755..3979a05aa0 100644
--- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Buttons.kt
+++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Buttons.kt
@@ -18,9 +18,6 @@ package com.example.jetcaster.util
 
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconToggleButton
@@ -29,6 +26,7 @@ import androidx.compose.material3.IconToggleButtonShapes
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.example.jetcaster.R
@@ -56,9 +54,9 @@ fun ToggleFollowPodcastIconButton(isFollowed: Boolean, onClick: () -> Unit, modi
     ) {
         Icon(
             // TODO: think about animating these icons
-            imageVector = when {
-                isFollowed -> Icons.Default.Check
-                else -> Icons.Default.Add
+            painter = when {
+                isFollowed -> painterResource(id = R.drawable.ic_check)
+                else -> painterResource(id = R.drawable.ic_add)
             },
             contentDescription = when {
                 isFollowed -> stringResource(R.string.cd_following)
diff --git a/Jetcaster/mobile/src/main/res/drawable/genres.xml b/Jetcaster/mobile/src/main/res/drawable/genres.xml
index fcb2c6079f..1018f99bf5 100644
--- a/Jetcaster/mobile/src/main/res/drawable/genres.xml
+++ b/Jetcaster/mobile/src/main/res/drawable/genres.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M400,720Q450,720 485,685Q520,650 520,600L520,320L640,320L640,240L460,240L460,496Q446,488 431,484Q416,480 400,480Q350,480 315,515Q280,550 280,600Q280,650 315,685Q350,720 400,720ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_account_circle.xml b/Jetcaster/mobile/src/main/res/drawable/ic_account_circle.xml
new file mode 100644
index 0000000000..67542bfa21
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_account_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M234,684Q285,645 348,622.5Q411,600 480,600Q549,600 612,622.5Q675,645 726,684Q761,643 780.5,591Q800,539 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,539 179.5,591Q199,643 234,684ZM480,520Q421,520 380.5,479.5Q340,439 340,380Q340,321 380.5,280.5Q421,240 480,240Q539,240 579.5,280.5Q620,321 620,380Q620,439 579.5,479.5Q539,520 480,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_add.xml b/Jetcaster/mobile/src/main/res/drawable/ic_add.xml
new file mode 100644
index 0000000000..2fcde96c96
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_arrow_back.xml b/Jetcaster/mobile/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000..800941dba5
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M313,520L537,744L480,800L160,480L480,160L537,216L313,440L800,440L800,520L313,520Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_check.xml b/Jetcaster/mobile/src/main/res/drawable/ic_check.xml
new file mode 100644
index 0000000000..6f1fcce828
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_delete.xml b/Jetcaster/mobile/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 0000000000..f538c1cc13
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_forward_10.xml b/Jetcaster/mobile/src/main/res/drawable/ic_forward_10.xml
new file mode 100644
index 0000000000..7526b1a6b5
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_forward_10.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M360,640L360,460L300,460L300,400L420,400L420,640L360,640ZM500,640Q483,640 471.5,628.5Q460,617 460,600L460,440Q460,423 471.5,411.5Q483,400 500,400L580,400Q597,400 608.5,411.5Q620,423 620,440L620,600Q620,617 608.5,628.5Q597,640 580,640L500,640ZM520,580L560,580Q560,580 560,580Q560,580 560,580L560,460Q560,460 560,460Q560,460 560,460L520,460Q520,460 520,460Q520,460 520,460L520,580Q520,580 520,580Q520,580 520,580ZM480,880Q405,880 339.5,851.5Q274,823 225.5,774.5Q177,726 148.5,660.5Q120,595 120,520Q120,445 148.5,379.5Q177,314 225.5,265.5Q274,217 339.5,188.5Q405,160 480,160L486,160L424,98L480,40L640,200L480,360L424,302L486,240L480,240Q363,240 281.5,321.5Q200,403 200,520Q200,637 281.5,718.5Q363,800 480,800Q597,800 678.5,718.5Q760,637 760,520L840,520Q840,595 811.5,660.5Q783,726 734.5,774.5Q686,823 620.5,851.5Q555,880 480,880Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_library_music.xml b/Jetcaster/mobile/src/main/res/drawable/ic_library_music.xml
new file mode 100644
index 0000000000..790e3f6628
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_library_music.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M500,600Q542,600 571,571Q600,542 600,500L600,280L720,280L720,200L560,200L560,420Q547,410 532,405Q517,400 500,400Q458,400 429,429Q400,458 400,500Q400,542 429,571Q458,600 500,600ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_more_vert.xml b/Jetcaster/mobile/src/main/res/drawable/ic_more_vert.xml
new file mode 100644
index 0000000000..59400ec977
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_more_vert.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_notifications.xml b/Jetcaster/mobile/src/main/res/drawable/ic_notifications.xml
new file mode 100644
index 0000000000..cd47b10ae1
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_notifications.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_notifications_active.xml b/Jetcaster/mobile/src/main/res/drawable/ic_notifications_active.xml
new file mode 100644
index 0000000000..771bf6535d
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_notifications_active.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,760L160,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L800,680L800,760L160,760ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM80,400Q80,300 124.5,216.5Q169,133 244,78L291,142Q231,186 195.5,253Q160,320 160,400L80,400ZM800,400Q800,320 764.5,253Q729,186 669,142L716,78Q791,133 835.5,216.5Q880,300 880,400L800,400Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_pause.xml b/Jetcaster/mobile/src/main/res/drawable/ic_pause.xml
new file mode 100644
index 0000000000..eef07ec5e7
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_pause.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M640,760Q607,760 583.5,736.5Q560,713 560,680L560,280Q560,247 583.5,223.5Q607,200 640,200L640,200Q673,200 696.5,223.5Q720,247 720,280L720,680Q720,713 696.5,736.5Q673,760 640,760ZM320,760Q287,760 263.5,736.5Q240,713 240,680L240,280Q240,247 263.5,223.5Q287,200 320,200L320,200Q353,200 376.5,223.5Q400,247 400,280L400,680Q400,713 376.5,736.5Q353,760 320,760Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_play_arrow.xml b/Jetcaster/mobile/src/main/res/drawable/ic_play_arrow.xml
new file mode 100644
index 0000000000..a770230e88
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_play_arrow.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M320,687L320,273Q320,256 332,244.5Q344,233 360,233Q365,233 370.5,234.5Q376,236 381,239L707,446Q716,452 720.5,461Q725,470 725,480Q725,490 720.5,499Q716,508 707,514L381,721Q376,724 370.5,725.5Q365,727 360,727Q344,727 332,715.5Q320,704 320,687Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_play_circle.xml b/Jetcaster/mobile/src/main/res/drawable/ic_play_circle.xml
new file mode 100644
index 0000000000..6a4add8dda
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_play_circle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M426,630L621,505Q635,496 635,480Q635,464 621,455L426,330Q411,320 395.5,328.5Q380,337 380,355L380,605Q380,623 395.5,631.5Q411,640 426,630ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_playlist_add.xml b/Jetcaster/mobile/src/main/res/drawable/ic_playlist_add.xml
new file mode 100644
index 0000000000..5022c69f3c
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_playlist_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,640L120,560L400,560L400,640L120,640ZM120,480L120,400L560,400L560,480L120,480ZM120,320L120,240L560,240L560,320L120,320ZM640,800L640,640L480,640L480,560L640,560L640,400L720,400L720,560L880,560L880,640L720,640L720,800L640,800Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_replay_10.xml b/Jetcaster/mobile/src/main/res/drawable/ic_replay_10.xml
new file mode 100644
index 0000000000..f9826d9a05
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_replay_10.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880Q405,880 339.5,851.5Q274,823 225.5,774.5Q177,726 148.5,660.5Q120,595 120,520L200,520Q200,637 281.5,718.5Q363,800 480,800Q597,800 678.5,718.5Q760,637 760,520Q760,403 678.5,321.5Q597,240 480,240L474,240L536,302L480,360L320,200L480,40L536,98L474,160L480,160Q555,160 620.5,188.5Q686,217 734.5,265.5Q783,314 811.5,379.5Q840,445 840,520Q840,595 811.5,660.5Q783,726 734.5,774.5Q686,823 620.5,851.5Q555,880 480,880ZM360,640L360,460L300,460L300,400L420,400L420,640L360,640ZM500,640Q483,640 471.5,628.5Q460,617 460,600L460,440Q460,423 471.5,411.5Q483,400 500,400L580,400Q597,400 608.5,411.5Q620,423 620,440L620,600Q620,617 608.5,628.5Q597,640 580,640L500,640ZM520,580L560,580Q560,580 560,580Q560,580 560,580L560,460Q560,460 560,460Q560,460 560,460L520,460Q520,460 520,460Q520,460 520,460L520,580Q520,580 520,580Q520,580 520,580Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_search.xml b/Jetcaster/mobile/src/main/res/drawable/ic_search.xml
new file mode 100644
index 0000000000..20c7b4e734
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M784,840L532,588Q502,612 463,626Q424,640 380,640Q271,640 195.5,564.5Q120,489 120,380Q120,271 195.5,195.5Q271,120 380,120Q489,120 564.5,195.5Q640,271 640,380Q640,424 626,463Q612,502 588,532L840,784L784,840ZM380,560Q455,560 507.5,507.5Q560,455 560,380Q560,305 507.5,252.5Q455,200 380,200Q305,200 252.5,252.5Q200,305 200,380Q200,455 252.5,507.5Q305,560 380,560Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_skip_next.xml b/Jetcaster/mobile/src/main/res/drawable/ic_skip_next.xml
new file mode 100644
index 0000000000..09407f6551
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_skip_next.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M660,680L660,280Q660,263 671.5,251.5Q683,240 700,240Q717,240 728.5,251.5Q740,263 740,280L740,680Q740,697 728.5,708.5Q717,720 700,720Q683,720 671.5,708.5Q660,697 660,680ZM220,645L220,315Q220,297 232,286Q244,275 260,275Q265,275 271,276Q277,277 282,281L530,447Q539,453 543.5,461.5Q548,470 548,480Q548,490 543.5,498.5Q539,507 530,513L282,679Q277,683 271,684Q265,685 260,685Q244,685 232,674Q220,663 220,645Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_skip_previous.xml b/Jetcaster/mobile/src/main/res/drawable/ic_skip_previous.xml
new file mode 100644
index 0000000000..f494ae6538
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_skip_previous.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M220,680L220,280Q220,263 231.5,251.5Q243,240 260,240Q277,240 288.5,251.5Q300,263 300,280L300,680Q300,697 288.5,708.5Q277,720 260,720Q243,720 231.5,708.5Q220,697 220,680ZM678,679L430,513Q421,507 416.5,498.5Q412,490 412,480Q412,470 416.5,461.5Q421,453 430,447L678,281Q683,277 689,276Q695,275 700,275Q716,275 728,286Q740,297 740,315L740,645Q740,663 728,674Q716,685 700,685Q695,685 689,684Q683,683 678,679Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/drawable/ic_video_library.xml b/Jetcaster/mobile/src/main/res/drawable/ic_video_library.xml
new file mode 100644
index 0000000000..54ee520a83
--- /dev/null
+++ b/Jetcaster/mobile/src/main/res/drawable/ic_video_library.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M460,580L740,400L460,220L460,580ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880Z"/>
+</vector>
diff --git a/Jetcaster/mobile/src/main/res/values/strings.xml b/Jetcaster/mobile/src/main/res/values/strings.xml
index 4a32133d5e..1b8a07345b 100644
--- a/Jetcaster/mobile/src/main/res/values/strings.xml
+++ b/Jetcaster/mobile/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
     <string name="connection_error_title">Connection error</string>
     <string name="connection_error_message">Unable to fetch podcasts feeds.\nCheck your internet connection and try again.</string>
     <string name="retry_label">Retry</string>
-    
+
     <string name="your_podcasts">Your podcasts</string>
     <string name="latest_episodes">Latest episodes</string>
 
diff --git a/Jetcaster/tv/build.gradle.kts b/Jetcaster/tv/build.gradle.kts
index d8befdfe15..9b890da4f1 100644
--- a/Jetcaster/tv/build.gradle.kts
+++ b/Jetcaster/tv/build.gradle.kts
@@ -98,7 +98,6 @@ dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.material.iconsExtended)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.tv.material)
     implementation(libs.androidx.lifecycle.runtime)
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/JetcasterApp.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/JetcasterApp.kt
index 56405f9ac9..147ad25575 100644
--- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/JetcasterApp.kt
+++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/JetcasterApp.kt
@@ -21,12 +21,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Person
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.filled.VideoLibrary
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -35,6 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.res.painterResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -44,6 +39,7 @@ import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.NavigationDrawer
 import androidx.tv.material3.NavigationDrawerItem
 import androidx.tv.material3.Text
+import com.example.jetcaster.tv.R
 import com.example.jetcaster.tv.ui.discover.DiscoverScreen
 import com.example.jetcaster.tv.ui.episode.EpisodeScreen
 import com.example.jetcaster.tv.ui.library.LibraryScreen
@@ -90,7 +86,7 @@ private fun GlobalNavigationContainer(
                 NavigationDrawerItem(
                     selected = isClosed && currentRoute == Screen.Profile.route,
                     onClick = jetcasterAppState::navigateToProfile,
-                    leadingContent = { Icon(Icons.Default.Person, contentDescription = null) },
+                    leadingContent = { Icon(painterResource(id = R.drawable.ic_person), contentDescription = null) },
                 ) {
                     Column {
                         Text(text = "Name")
@@ -106,7 +102,7 @@ private fun GlobalNavigationContainer(
                     onClick = jetcasterAppState::navigateToSearch,
                     leadingContent = {
                         Icon(
-                            Icons.Default.Search,
+                            painterResource(id = R.drawable.ic_search),
                             contentDescription = null,
                         )
                     },
@@ -118,7 +114,7 @@ private fun GlobalNavigationContainer(
                     onClick = jetcasterAppState::navigateToDiscover,
                     leadingContent = {
                         Icon(
-                            Icons.Default.Home,
+                            painterResource(id = R.drawable.ic_home),
                             contentDescription = null,
                         )
                     },
@@ -131,7 +127,7 @@ private fun GlobalNavigationContainer(
                     onClick = jetcasterAppState::navigateToLibrary,
                     leadingContent = {
                         Icon(
-                            Icons.Default.VideoLibrary,
+                            painterResource(id = R.drawable.ic_video_library),
                             contentDescription = null,
                         )
                     },
@@ -143,7 +139,7 @@ private fun GlobalNavigationContainer(
                 NavigationDrawerItem(
                     selected = isClosed && currentRoute == Screen.Settings.route,
                     onClick = jetcasterAppState::navigateToSettings,
-                    leadingContent = { Icon(Icons.Default.Settings, contentDescription = null) },
+                    leadingContent = { Icon(painterResource(id = R.drawable.ic_settings), contentDescription = null) },
                 ) {
                     Text(text = "Settings")
                 }
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Button.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Button.kt
index 79f2f8016c..6bf564b76e 100644
--- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Button.kt
+++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Button.kt
@@ -17,18 +17,9 @@
 package com.example.jetcaster.tv.ui.component
 
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
-import androidx.compose.material.icons.filled.Forward10
-import androidx.compose.material.icons.filled.Pause
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.filled.Replay10
-import androidx.compose.material.icons.filled.SkipNext
-import androidx.compose.material.icons.filled.SkipPrevious
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.PlayArrow
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.tv.material3.ButtonDefaults
@@ -39,7 +30,7 @@ import com.example.jetcaster.tv.R
 
 @Composable
 internal fun PlayButton(onClick: () -> Unit, modifier: Modifier = Modifier, scale: ButtonScale = ButtonDefaults.scale()) = ButtonWithIcon(
-    icon = Icons.Outlined.PlayArrow,
+    iconId = R.drawable.ic_play_arrow,
     label = stringResource(R.string.label_play),
     onClick = onClick,
     modifier = modifier,
@@ -50,7 +41,7 @@ internal fun PlayButton(onClick: () -> Unit, modifier: Modifier = Modifier, scal
 internal fun EnqueueButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     IconButton(onClick = onClick, modifier = modifier) {
         Icon(
-            Icons.AutoMirrored.Filled.PlaylistAdd,
+            painterResource(id = R.drawable.ic_playlist_add),
             contentDescription = stringResource(R.string.label_add_playlist),
         )
     }
@@ -60,7 +51,7 @@ internal fun EnqueueButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
 internal fun InfoButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     IconButton(onClick = onClick, modifier = modifier) {
         Icon(
-            Icons.Outlined.Info,
+            painterResource(id = R.drawable.ic_info),
             contentDescription = stringResource(R.string.label_info),
         )
     }
@@ -70,7 +61,7 @@ internal fun InfoButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
 internal fun PreviousButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     IconButton(onClick = onClick, modifier = modifier) {
         Icon(
-            Icons.Default.SkipPrevious,
+            painterResource(id = R.drawable.ic_skip_previous),
             contentDescription = stringResource(R.string.label_previous_episode),
         )
     }
@@ -80,7 +71,7 @@ internal fun PreviousButton(onClick: () -> Unit, modifier: Modifier = Modifier)
 internal fun NextButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     IconButton(onClick = onClick, modifier = modifier) {
         Icon(
-            Icons.Default.SkipNext,
+            painterResource(id = R.drawable.ic_skip_next),
             contentDescription = stringResource(R.string.label_next_episode),
         )
     }
@@ -89,9 +80,9 @@ internal fun NextButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
 @Composable
 internal fun PlayPauseButton(isPlaying: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {
     val (icon, description) = if (isPlaying) {
-        Icons.Default.Pause to stringResource(R.string.label_pause)
+        painterResource(id = R.drawable.ic_pause) to stringResource(R.string.label_pause)
     } else {
-        Icons.Default.PlayArrow to stringResource(R.string.label_play)
+        painterResource(id = R.drawable.ic_play_arrow) to stringResource(R.string.label_play)
     }
     IconButton(onClick = onClick, modifier = modifier) {
         Icon(icon, description, modifier = Modifier.size(48.dp))
@@ -102,7 +93,7 @@ internal fun PlayPauseButton(isPlaying: Boolean, onClick: () -> Unit, modifier:
 internal fun RewindButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     IconButton(onClick = onClick, modifier = modifier) {
         Icon(
-            Icons.Default.Replay10,
+            painterResource(id = R.drawable.ic_replay_10),
             contentDescription = stringResource(R.string.label_rewind),
         )
     }
@@ -112,7 +103,7 @@ internal fun RewindButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
 internal fun SkipButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
     IconButton(onClick = onClick, modifier = modifier) {
         Icon(
-            Icons.Default.Forward10,
+            painterResource(id = R.drawable.ic_forward_10),
             contentDescription = stringResource(R.string.label_skip),
         )
     }
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/ButtonWithIcon.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/ButtonWithIcon.kt
index b5fa71653c..ce4314810a 100644
--- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/ButtonWithIcon.kt
+++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/ButtonWithIcon.kt
@@ -16,11 +16,12 @@
 
 package com.example.jetcaster.tv.ui.component
 
+import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Button
 import androidx.tv.material3.ButtonDefaults
@@ -31,14 +32,14 @@ import androidx.tv.material3.Text
 @Composable
 internal fun ButtonWithIcon(
     label: String,
-    icon: ImageVector,
+    @DrawableRes iconId: Int,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     scale: ButtonScale = ButtonDefaults.scale(),
 ) {
     Button(onClick = onClick, modifier = modifier, scale = scale) {
         Icon(
-            icon,
+            painterResource(id = iconId),
             contentDescription = null,
         )
         Spacer(modifier = Modifier.width(6.dp))
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt
index 75b4b743fb..5db3b9a5c6 100644
--- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt
+++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt
@@ -29,9 +29,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Remove
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -228,10 +225,10 @@ private fun ToggleSubscriptionButton(
     unsubscribe: (PodcastInfo, Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val icon = if (isSubscribed) {
-        Icons.Default.Remove
+    val iconId = if (isSubscribed) {
+        R.drawable.ic_remove
     } else {
-        Icons.Default.Add
+        R.drawable.ic_add
     }
     val label = if (isSubscribed) {
         stringResource(R.string.label_unsubscribe)
@@ -245,7 +242,7 @@ private fun ToggleSubscriptionButton(
     }
     ButtonWithIcon(
         label = label,
-        icon = icon,
+        iconId = iconId,
         onClick = { action(podcastInfo, isSubscribed) },
         scale = ButtonDefaults.scale(scale = 1f),
         modifier = modifier,
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt
index 0fd3bb0ee9..ebb00cc6c1 100644
--- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt
+++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt
@@ -32,8 +32,6 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Search
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -46,6 +44,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
@@ -207,7 +206,7 @@ private fun KeywordInput(keyword: String, onKeywordInput: (String) -> Unit, modi
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Icon(
-                        Icons.Default.Search,
+                        painterResource(id = R.drawable.ic_search),
                         contentDescription = stringResource(R.string.label_search),
                         modifier = Modifier.padding(end = 12.dp),
                     )
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_add.xml b/Jetcaster/tv/src/main/res/drawable/ic_add.xml
new file mode 100644
index 0000000000..2fcde96c96
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_forward_10.xml b/Jetcaster/tv/src/main/res/drawable/ic_forward_10.xml
new file mode 100644
index 0000000000..7526b1a6b5
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_forward_10.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M360,640L360,460L300,460L300,400L420,400L420,640L360,640ZM500,640Q483,640 471.5,628.5Q460,617 460,600L460,440Q460,423 471.5,411.5Q483,400 500,400L580,400Q597,400 608.5,411.5Q620,423 620,440L620,600Q620,617 608.5,628.5Q597,640 580,640L500,640ZM520,580L560,580Q560,580 560,580Q560,580 560,580L560,460Q560,460 560,460Q560,460 560,460L520,460Q520,460 520,460Q520,460 520,460L520,580Q520,580 520,580Q520,580 520,580ZM480,880Q405,880 339.5,851.5Q274,823 225.5,774.5Q177,726 148.5,660.5Q120,595 120,520Q120,445 148.5,379.5Q177,314 225.5,265.5Q274,217 339.5,188.5Q405,160 480,160L486,160L424,98L480,40L640,200L480,360L424,302L486,240L480,240Q363,240 281.5,321.5Q200,403 200,520Q200,637 281.5,718.5Q363,800 480,800Q597,800 678.5,718.5Q760,637 760,520L840,520Q840,595 811.5,660.5Q783,726 734.5,774.5Q686,823 620.5,851.5Q555,880 480,880Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_home.xml b/Jetcaster/tv/src/main/res/drawable/ic_home.xml
new file mode 100644
index 0000000000..9ef27eace1
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_home.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,840L160,360L480,120L800,360L800,840L560,840L560,560L400,560L400,840L160,840Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_info.xml b/Jetcaster/tv/src/main/res/drawable/ic_info.xml
new file mode 100644
index 0000000000..1ece0341d0
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,680L520,680L520,440L440,440L440,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_library_music.xml b/Jetcaster/tv/src/main/res/drawable/ic_library_music.xml
new file mode 100644
index 0000000000..790e3f6628
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_library_music.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M500,600Q542,600 571,571Q600,542 600,500L600,280L720,280L720,200L560,200L560,420Q547,410 532,405Q517,400 500,400Q458,400 429,429Q400,458 400,500Q400,542 429,571Q458,600 500,600ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_pause.xml b/Jetcaster/tv/src/main/res/drawable/ic_pause.xml
new file mode 100644
index 0000000000..8a7990144b
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_pause.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M560,760L560,200L720,200L720,760L560,760ZM240,760L240,200L400,200L400,760L240,760Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_person.xml b/Jetcaster/tv/src/main/res/drawable/ic_person.xml
new file mode 100644
index 0000000000..aef9927129
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_person.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,800L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,800L160,800Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_play_arrow.xml b/Jetcaster/tv/src/main/res/drawable/ic_play_arrow.xml
new file mode 100644
index 0000000000..582bcd142d
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_play_arrow.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M320,760L320,200L760,480L320,760ZM400,480L400,480L400,480ZM400,614L610,480L400,346L400,614Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_playlist_add.xml b/Jetcaster/tv/src/main/res/drawable/ic_playlist_add.xml
new file mode 100644
index 0000000000..5022c69f3c
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_playlist_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,640L120,560L400,560L400,640L120,640ZM120,480L120,400L560,400L560,480L120,480ZM120,320L120,240L560,240L560,320L120,320ZM640,800L640,640L480,640L480,560L640,560L640,400L720,400L720,560L880,560L880,640L720,640L720,800L640,800Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_remove.xml b/Jetcaster/tv/src/main/res/drawable/ic_remove.xml
new file mode 100644
index 0000000000..0cc9cffb46
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_remove.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,520L200,440L760,440L760,520L200,520Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_replay_10.xml b/Jetcaster/tv/src/main/res/drawable/ic_replay_10.xml
new file mode 100644
index 0000000000..f9826d9a05
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_replay_10.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880Q405,880 339.5,851.5Q274,823 225.5,774.5Q177,726 148.5,660.5Q120,595 120,520L200,520Q200,637 281.5,718.5Q363,800 480,800Q597,800 678.5,718.5Q760,637 760,520Q760,403 678.5,321.5Q597,240 480,240L474,240L536,302L480,360L320,200L480,40L536,98L474,160L480,160Q555,160 620.5,188.5Q686,217 734.5,265.5Q783,314 811.5,379.5Q840,445 840,520Q840,595 811.5,660.5Q783,726 734.5,774.5Q686,823 620.5,851.5Q555,880 480,880ZM360,640L360,460L300,460L300,400L420,400L420,640L360,640ZM500,640Q483,640 471.5,628.5Q460,617 460,600L460,440Q460,423 471.5,411.5Q483,400 500,400L580,400Q597,400 608.5,411.5Q620,423 620,440L620,600Q620,617 608.5,628.5Q597,640 580,640L500,640ZM520,580L560,580Q560,580 560,580Q560,580 560,580L560,460Q560,460 560,460Q560,460 560,460L520,460Q520,460 520,460Q520,460 520,460L520,580Q520,580 520,580Q520,580 520,580Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_search.xml b/Jetcaster/tv/src/main/res/drawable/ic_search.xml
new file mode 100644
index 0000000000..20c7b4e734
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M784,840L532,588Q502,612 463,626Q424,640 380,640Q271,640 195.5,564.5Q120,489 120,380Q120,271 195.5,195.5Q271,120 380,120Q489,120 564.5,195.5Q640,271 640,380Q640,424 626,463Q612,502 588,532L840,784L784,840ZM380,560Q455,560 507.5,507.5Q560,455 560,380Q560,305 507.5,252.5Q455,200 380,200Q305,200 252.5,252.5Q200,305 200,380Q200,455 252.5,507.5Q305,560 380,560Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_settings.xml b/Jetcaster/tv/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000..0b0cc8700e
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_skip_next.xml b/Jetcaster/tv/src/main/res/drawable/ic_skip_next.xml
new file mode 100644
index 0000000000..ba5057f655
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_skip_next.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M660,720L660,240L740,240L740,720L660,720ZM220,720L220,240L580,480L220,720Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_skip_previous.xml b/Jetcaster/tv/src/main/res/drawable/ic_skip_previous.xml
new file mode 100644
index 0000000000..a4a0b659c9
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_skip_previous.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M220,720L220,240L300,240L300,720L220,720ZM740,720L380,480L740,240L740,720Z"/>
+</vector>
diff --git a/Jetcaster/tv/src/main/res/drawable/ic_video_library.xml b/Jetcaster/tv/src/main/res/drawable/ic_video_library.xml
new file mode 100644
index 0000000000..54ee520a83
--- /dev/null
+++ b/Jetcaster/tv/src/main/res/drawable/ic_video_library.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M460,580L740,400L460,220L460,580ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880Z"/>
+</vector>
diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle
index 59e7886262..a21e5a5812 100644
--- a/Jetcaster/wear/build.gradle
+++ b/Jetcaster/wear/build.gradle
@@ -96,8 +96,6 @@ dependencies {
 
     // Foundation is additive, so you can use the mobile version in your Wear OS app.
     implementation libs.androidx.wear.compose.foundation
-    implementation(libs.androidx.material.icons.core)
-    implementation(libs.androidx.compose.material.iconsExtended)
 
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.ui.compose)
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt
index 85f48ac47e..2f9f130302 100644
--- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt
+++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt
@@ -20,8 +20,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -238,7 +236,7 @@ fun LoadedButtonsContent(
             enabled = enabled,
         ) {
             Icon(
-                imageVector = Icons.AutoMirrored.Filled.PlaylistAdd,
+                painterResource(id = R.drawable.ic_playlist_add),
                 contentDescription = stringResource(id = R.string.add_to_queue_content_description),
             )
         }
diff --git a/Jetcaster/wear/src/main/res/drawable/ic_playlist_add.xml b/Jetcaster/wear/src/main/res/drawable/ic_playlist_add.xml
new file mode 100644
index 0000000000..5022c69f3c
--- /dev/null
+++ b/Jetcaster/wear/src/main/res/drawable/ic_playlist_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,640L120,560L400,560L400,640L120,640ZM120,480L120,400L560,400L560,480L120,480ZM120,320L120,240L560,240L560,320L120,320ZM640,800L640,640L480,640L480,560L640,560L640,400L720,400L720,560L880,560L880,640L720,640L720,800L640,800Z"/>
+</vector>