diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index da1eea4134..6919519fc1 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -135,6 +135,33 @@
     <attr name="resize_mode"/>
   </declare-styleable>
 
+  <declare-styleable name="PlayerControlView">
+    <attr name="show_timeout"/>
+    <attr name="repeat_toggle_modes"/>
+    <attr name="show_rewind_button"/>
+    <attr name="show_fastforward_button"/>
+    <attr name="show_previous_button"/>
+    <attr name="show_next_button"/>
+    <attr name="show_shuffle_button"/>
+    <attr name="time_bar_min_update_interval"/>
+    <attr name="controller_layout_id"/>
+    <!-- DefaultTimeBar attributes -->
+    <attr name="bar_height"/>
+    <attr name="bar_gravity"/>
+    <attr name="touch_target_height"/>
+    <attr name="ad_marker_width"/>
+    <attr name="scrubber_enabled_size"/>
+    <attr name="scrubber_disabled_size"/>
+    <attr name="scrubber_dragged_size"/>
+    <attr name="scrubber_drawable"/>
+    <attr name="played_color"/>
+    <attr name="scrubber_color"/>
+    <attr name="buffered_color" />
+    <attr name="unplayed_color"/>
+    <attr name="ad_marker_color"/>
+    <attr name="played_ad_marker_color"/>
+  </declare-styleable>
+
   <declare-styleable name="StyledPlayerControlView">
     <attr name="show_timeout"/>
     <attr name="repeat_toggle_modes"/>
diff --git a/library/ui/src/main/res/values/attrs_legacy.xml b/library/ui/src/main/res/values/attrs_legacy_player_view.xml
similarity index 67%
rename from library/ui/src/main/res/values/attrs_legacy.xml
rename to library/ui/src/main/res/values/attrs_legacy_player_view.xml
index 1a2b462dee..c4592cf037 100644
--- a/library/ui/src/main/res/values/attrs_legacy.xml
+++ b/library/ui/src/main/res/values/attrs_legacy_player_view.xml
@@ -51,31 +51,4 @@
     <attr name="played_ad_marker_color"/>
   </declare-styleable>
 
-  <declare-styleable name="PlayerControlView">
-    <attr name="show_timeout"/>
-    <attr name="repeat_toggle_modes"/>
-    <attr name="show_rewind_button"/>
-    <attr name="show_fastforward_button"/>
-    <attr name="show_previous_button"/>
-    <attr name="show_next_button"/>
-    <attr name="show_shuffle_button"/>
-    <attr name="time_bar_min_update_interval"/>
-    <attr name="controller_layout_id"/>
-    <!-- DefaultTimeBar attributes -->
-    <attr name="bar_height"/>
-    <attr name="bar_gravity"/>
-    <attr name="touch_target_height"/>
-    <attr name="ad_marker_width"/>
-    <attr name="scrubber_enabled_size"/>
-    <attr name="scrubber_disabled_size"/>
-    <attr name="scrubber_dragged_size"/>
-    <attr name="scrubber_drawable"/>
-    <attr name="played_color"/>
-    <attr name="scrubber_color"/>
-    <attr name="buffered_color" />
-    <attr name="unplayed_color"/>
-    <attr name="ad_marker_color"/>
-    <attr name="played_ad_marker_color"/>
-  </declare-styleable>
-
 </resources>
diff --git a/library/ui/src/main/res/values/drawables.xml b/library/ui/src/main/res/values/drawables.xml
index 9f3227b29e..abfb2d262d 100644
--- a/library/ui/src/main/res/values/drawables.xml
+++ b/library/ui/src/main/res/values/drawables.xml
@@ -23,6 +23,21 @@
   <drawable name="exo_notification_stop">@drawable/exo_icon_stop</drawable>
   <drawable name="exo_notification_small_icon">@drawable/exo_icon_circular_play</drawable>
 
+  <drawable name="exo_controls_play">@drawable/exo_icon_play</drawable>
+  <drawable name="exo_controls_pause">@drawable/exo_icon_pause</drawable>
+  <drawable name="exo_controls_next">@drawable/exo_icon_next</drawable>
+  <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_styled_controls_play">@drawable/exo_ic_play_circle_filled</drawable>
   <drawable name="exo_styled_controls_pause">@drawable/exo_ic_pause_circle_filled</drawable>
   <drawable name="exo_styled_controls_next">@drawable/exo_ic_skip_next</drawable>
diff --git a/library/ui/src/main/res/values/drawables_legacy.xml b/library/ui/src/main/res/values/drawables_legacy.xml
deleted file mode 100644
index 8f438ffb58..0000000000
--- a/library/ui/src/main/res/values/drawables_legacy.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources>
-  <drawable name="exo_controls_play">@drawable/exo_icon_play</drawable>
-  <drawable name="exo_controls_pause">@drawable/exo_icon_pause</drawable>
-  <drawable name="exo_controls_next">@drawable/exo_icon_next</drawable>
-  <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>
-</resources>