diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5ed1dfd44f..9c0f2962fc 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -48,7 +48,6 @@
         `LeanbackPlayerAdapter` and use `ControlDispatcher` for dispatching
         prepare instead
         ([#7882](https://github.com/google/ExoPlayer/issues/7882)).
-    *   Switch `StyledPlayerControlView` button controls to borderless ripples.
     *   Add `bar_gravity` attribute into `DefaultTimeBar`.
     *   Increase seekbar's touch target height in `StyledPlayerControlView`.
     *   Update Styled Player settings dialogs to respect RTL.
diff --git a/library/ui/src/main/res/drawable/exo_selectable_item_background_borderless.xml b/library/ui/src/main/res/drawable-v21/exo_ripple_ffwd.xml
similarity index 63%
rename from library/ui/src/main/res/drawable/exo_selectable_item_background_borderless.xml
rename to library/ui/src/main/res/drawable-v21/exo_ripple_ffwd.xml
index 7a267a0a52..5e4dd5550f 100644
--- a/library/ui/src/main/res/drawable/exo_selectable_item_background_borderless.xml
+++ b/library/ui/src/main/res/drawable-v21/exo_ripple_ffwd.xml
@@ -14,7 +14,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
+<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>
diff --git a/library/ui/src/main/res/drawable-v21/exo_selectable_item_background_borderless.xml b/library/ui/src/main/res/drawable-v21/exo_ripple_rew.xml
similarity index 63%
rename from library/ui/src/main/res/drawable-v21/exo_selectable_item_background_borderless.xml
rename to library/ui/src/main/res/drawable-v21/exo_ripple_rew.xml
index e9b1474003..ee43206b4a 100644
--- a/library/ui/src/main/res/drawable-v21/exo_selectable_item_background_borderless.xml
+++ b/library/ui/src/main/res/drawable-v21/exo_ripple_rew.xml
@@ -14,7 +14,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
+<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>
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 f28eef2839..9f7e1fd027 100644
--- a/library/ui/src/main/res/drawable/exo_ripple_ffwd.xml
+++ b/library/ui/src/main/res/drawable/exo_ripple_ffwd.xml
@@ -14,8 +14,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
+<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>
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 a2cc2f8908..5562b1352c 100644
--- a/library/ui/src/main/res/drawable/exo_ripple_rew.xml
+++ b/library/ui/src/main/res/drawable/exo_ripple_rew.xml
@@ -14,8 +14,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>
+<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>
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 ab82d5350d..75db3e4527 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,10 +16,8 @@
 <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 844bbc23c1..b27a13e924 100644
--- a/library/ui/src/main/res/values/colors.xml
+++ b/library/ui/src/main/res/values/colors.xml
@@ -15,6 +15,8 @@
     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 060ced3577..7133b78f70 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">@drawable/exo_selectable_item_background_borderless</item>
+    <item name="android:background">?android:attr/selectableItemBackground</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>
@@ -141,7 +141,6 @@
   </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>