diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5f5df4377c..94d173da4e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -36,6 +36,7 @@
         `LeanbackPlayerAdapter` and use `ControlDispatcher` for dispatching
         prepare instead
         ([#7882](https://github.com/google/ExoPlayer/issues/7882)).
+    *   Switch StyledPlayerView button controls to borderless ripples.
 *   Audio:
     *   Retry playback after some types of `AudioTrack` error.
     *   Work around `AudioManager` crashes when calling `getStreamVolume`
diff --git a/library/ui/src/main/res/drawable-v21/exo_ripple_rew.xml b/library/ui/src/main/res/drawable-v21/exo_selectable_item_background_borderless.xml
similarity index 63%
rename from library/ui/src/main/res/drawable-v21/exo_ripple_rew.xml
rename to library/ui/src/main/res/drawable-v21/exo_selectable_item_background_borderless.xml
index ee43206b4a..e9b1474003 100644
--- a/library/ui/src/main/res/drawable-v21/exo_ripple_rew.xml
+++ b/library/ui/src/main/res/drawable-v21/exo_selectable_item_background_borderless.xml
@@ -14,13 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/exo_gray">
-  <item android:id="@android:id/mask">
-    <shape android:shape="rectangle">
-      <solid android:color="@color/exo_white" />
-    </shape>
-  </item>
-  <item android:id="@android:id/background"
-    android:drawable="@drawable/exo_styled_controls_rewind" />
-</ripple>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <!-- Borderless is not available before v21 -->
+  <item android:drawable="?android:attr/selectableItemBackgroundBorderless" />
+</layer-list>
diff --git a/library/ui/src/main/res/drawable/exo_ripple_ffwd.xml b/library/ui/src/main/res/drawable/exo_ripple_ffwd.xml
index 9f7e1fd027..f28eef2839 100644
--- a/library/ui/src/main/res/drawable/exo_ripple_ffwd.xml
+++ b/library/ui/src/main/res/drawable/exo_ripple_ffwd.xml
@@ -14,16 +14,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true">
-    <layer-list>
-      <item>
-      <shape>
-        <solid android:color="@color/exo_gray_ripple"/>
-      </shape>
-      </item>
-      <item android:drawable="@drawable/exo_styled_controls_fastforward"/>
-    </layer-list>
-  </item>
-  <item android:drawable="@drawable/exo_styled_controls_fastforward" />
-</selector>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:drawable="@drawable/exo_selectable_item_background_borderless" />
+  <item android:id="@android:id/background"
+    android:drawable="@drawable/exo_styled_controls_fastforward" />
+</layer-list>
diff --git a/library/ui/src/main/res/drawable/exo_ripple_rew.xml b/library/ui/src/main/res/drawable/exo_ripple_rew.xml
index 5562b1352c..a2cc2f8908 100644
--- a/library/ui/src/main/res/drawable/exo_ripple_rew.xml
+++ b/library/ui/src/main/res/drawable/exo_ripple_rew.xml
@@ -14,16 +14,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true">
-    <layer-list>
-      <item>
-      <shape>
-        <solid android:color="@color/exo_gray_ripple"/>
-      </shape>
-      </item>
-      <item android:drawable="@drawable/exo_styled_controls_rewind"/>
-    </layer-list>
-  </item>
-  <item android:drawable="@drawable/exo_styled_controls_rewind" />
-</selector>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:drawable="@drawable/exo_selectable_item_background_borderless" />
+  <item android:id="@android:id/background"
+    android:drawable="@drawable/exo_styled_controls_rewind" />
+</layer-list>
diff --git a/library/ui/src/main/res/drawable-v21/exo_ripple_ffwd.xml b/library/ui/src/main/res/drawable/exo_selectable_item_background_borderless.xml
similarity index 63%
rename from library/ui/src/main/res/drawable-v21/exo_ripple_ffwd.xml
rename to library/ui/src/main/res/drawable/exo_selectable_item_background_borderless.xml
index 5e4dd5550f..7a267a0a52 100644
--- a/library/ui/src/main/res/drawable-v21/exo_ripple_ffwd.xml
+++ b/library/ui/src/main/res/drawable/exo_selectable_item_background_borderless.xml
@@ -14,13 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/exo_gray">
-  <item android:id="@android:id/mask">
-    <shape android:shape="rectangle">
-      <solid android:color="@color/exo_white" />
-    </shape>
-  </item>
-  <item android:id="@android:id/background"
-    android:drawable="@drawable/exo_styled_controls_fastforward" />
-</ripple>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <!-- Borderless is not available before v21 -->
+  <item android:drawable="?android:attr/selectableItemBackground" />
+</layer-list>
diff --git a/library/ui/src/main/res/layout/exo_styled_embedded_transport_controls.xml b/library/ui/src/main/res/layout/exo_styled_embedded_transport_controls.xml
index 75db3e4527..ab82d5350d 100644
--- a/library/ui/src/main/res/layout/exo_styled_embedded_transport_controls.xml
+++ b/library/ui/src/main/res/layout/exo_styled_embedded_transport_controls.xml
@@ -16,8 +16,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:padding="24dp"
     android:gravity="center"
     android:orientation="horizontal"
+    android:background="@android:color/transparent"
     android:visibility="visible">
 
     <ImageButton android:id="@+id/exo_prev"
diff --git a/library/ui/src/main/res/values/colors.xml b/library/ui/src/main/res/values/colors.xml
index b27a13e924..844bbc23c1 100644
--- a/library/ui/src/main/res/values/colors.xml
+++ b/library/ui/src/main/res/values/colors.xml
@@ -15,8 +15,6 @@
     limitations under the License.
   -->
 <resources>
-    <color name="exo_gray">#808080</color>
-    <color name="exo_gray_ripple">#80808080</color>
     <color name="exo_white">#ffffff</color>
     <color name="exo_white_opacity_70">#B3ffffff</color>
     <color name="exo_black_opacity_70">#B3000000</color>
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index 38daccb377..8b48f2fcb5 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -59,7 +59,7 @@
   <style name="ExoStyledControls"/>
 
   <style name="ExoStyledControls.Button">
-    <item name="android:background">?android:attr/selectableItemBackground</item>
+    <item name="android:background">@drawable/exo_selectable_item_background_borderless</item>
     <item name="android:scaleType">fitXY</item>
     <item name="android:layout_marginLeft">@dimen/exo_icon_horizontal_margin</item>
     <item name="android:layout_marginRight">@dimen/exo_icon_horizontal_margin</item>
@@ -134,6 +134,7 @@
   </style>
 
   <style name="ExoStyledControls.Button.Bottom">
+    <item name="android:background">?android:attr/selectableItemBackground</item>
     <item name="android:gravity">center_horizontal</item>
     <item name="android:layout_width">@dimen/exo_small_icon_width</item>
     <item name="android:layout_height">@dimen/exo_small_icon_height</item>