diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 57ae217d05..9fcd586452 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -102,6 +102,9 @@
   * Make showing and hiding player controls accessible to TalkBack in
     `PlayerView`.
   * Rename `spherical_view` surface type to `spherical_gl_surface_view`.
+  * Make it easier to override the shuffle, repeat, fullscreen, VR and small
+    notification icon assets
+    ([#6709](https://github.com/google/ExoPlayer/issues/6709)).
 * Analytics:
   * Remove `AnalyticsCollector.Factory`. Instances should be created directly,
     and the `Player` should be set by calling `AnalyticsCollector.setPlayer`.
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_enter.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_enter.xml
rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_exit.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fullscreen_exit.xml
rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_all.xml
rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_off.xml
rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_repeat_one.xml
rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_off.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_off.xml
rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_on.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle_on.xml
rename to library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_notification_small_icon.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_enter.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_controls_fullscreen_exit.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_all.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_off.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_controls_repeat_one.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_off.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle_on.png
rename to library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_notification_small_icon.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_enter.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_controls_fullscreen_exit.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_all.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_off.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_controls_repeat_one.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_off.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle_on.png
rename to library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_notification_small_icon.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_enter.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_controls_fullscreen_exit.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_all.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_off.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_controls_repeat_one.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_off.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle_on.png
rename to library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_notification_small_icon.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_enter.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_fullscreen_exit.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_all.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_off.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_repeat_one.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_off.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle_on.png
rename to library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_notification_small_icon.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_enter.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_enter.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_exit.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_fullscreen_exit.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_all.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_all.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_off.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_off.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_one.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_repeat_one.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_off.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_off.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_on.png b/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle_on.png
rename to library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png
diff --git a/library/ui/src/main/res/drawable-xxxhdpi/exo_notification_small_icon.png b/library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxxhdpi/exo_notification_small_icon.png
rename to library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png
diff --git a/library/ui/src/main/res/values/drawables.xml b/library/ui/src/main/res/values/drawables.xml
index 3cd9168726..84c037a8b7 100644
--- a/library/ui/src/main/res/values/drawables.xml
+++ b/library/ui/src/main/res/values/drawables.xml
@@ -20,6 +20,14 @@
   <drawable name="exo_controls_previous">@drawable/exo_icon_previous</drawable>
   <drawable name="exo_controls_fastforward">@drawable/exo_icon_fastforward</drawable>
   <drawable name="exo_controls_rewind">@drawable/exo_icon_rewind</drawable>
+  <drawable name="exo_controls_repeat_all">@drawable/exo_icon_repeat_all</drawable>
+  <drawable name="exo_controls_repeat_off">@drawable/exo_icon_repeat_off</drawable>
+  <drawable name="exo_controls_repeat_one">@drawable/exo_icon_repeat_one</drawable>
+  <drawable name="exo_controls_shuffle_off">@drawable/exo_icon_shuffle_off</drawable>
+  <drawable name="exo_controls_shuffle_on">@drawable/exo_icon_shuffle_on</drawable>
+  <drawable name="exo_controls_fullscreen_enter">@drawable/exo_icon_fullscreen_enter</drawable>
+  <drawable name="exo_controls_fullscreen_exit">@drawable/exo_icon_fullscreen_exit</drawable>
+  <drawable name="exo_controls_vr">@drawable/exo_icon_vr</drawable>
   <drawable name="exo_notification_play">@drawable/exo_icon_play</drawable>
   <drawable name="exo_notification_pause">@drawable/exo_icon_pause</drawable>
   <drawable name="exo_notification_next">@drawable/exo_icon_next</drawable>
@@ -27,4 +35,5 @@
   <drawable name="exo_notification_fastforward">@drawable/exo_icon_fastforward</drawable>
   <drawable name="exo_notification_rewind">@drawable/exo_icon_rewind</drawable>
   <drawable name="exo_notification_stop">@drawable/exo_icon_stop</drawable>
+  <drawable name="exo_notification_small_icon">@drawable/exo_icon_circular_play</drawable>
 </resources>
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index c458a3ea99..c271a0af6d 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -52,7 +52,7 @@
   </style>
 
   <style name="ExoMediaButton.VR">
-    <item name="android:src">@drawable/exo_icon_vr</item>
+    <item name="android:src">@drawable/exo_controls_vr</item>
     <item name="android:contentDescription">@string/exo_controls_vr_description</item>
   </style>