From 8c837c6e2dbcfe1ea989a9f352af620dc269c865 Mon Sep 17 00:00:00 2001
From: jaewan <jaewan@google.com>
Date: Mon, 13 Dec 2021 03:36:35 +0000
Subject: [PATCH] Clean up resources

PiperOrigin-RevId: 415937814
---
 .../session/MediaNotificationHandler.java     |  16 +++---
 .../session/PlayerNotificationManager.java    |  54 +++++++++---------
 .../res/drawable/exo_icon_fastforward.xml     |  26 ---------
 .../src/main/res/drawable/exo_icon_next.xml   |  26 ---------
 .../src/main/res/drawable/exo_icon_pause.xml  |  26 ---------
 .../src/main/res/drawable/exo_icon_play.xml   |  26 ---------
 .../main/res/drawable/exo_icon_previous.xml   |  26 ---------
 .../src/main/res/drawable/exo_icon_rewind.xml |  26 ---------
 ...play.png => media3_icon_circular_play.png} | Bin
 ..._session_service_notification_ic_pause.xml |  26 ---------
 ...a_session_service_notification_ic_play.xml |  26 ---------
 ...n_service_notification_ic_skip_to_next.xml |  26 ---------
 ...rvice_notification_ic_skip_to_previous.xml |  26 ---------
 .../src/main/res/values-af/strings.xml        |   4 +-
 .../src/main/res/values-am/strings.xml        |   4 +-
 .../src/main/res/values-ar/strings.xml        |   4 +-
 .../src/main/res/values-as/strings.xml        |   4 +-
 .../src/main/res/values-az/strings.xml        |   4 +-
 .../src/main/res/values-b+sr+Latn/strings.xml |   4 +-
 .../src/main/res/values-be/strings.xml        |   4 +-
 .../src/main/res/values-bg/strings.xml        |   4 +-
 .../src/main/res/values-bn/strings.xml        |   4 +-
 .../src/main/res/values-bs/strings.xml        |   4 +-
 .../src/main/res/values-ca/strings.xml        |   4 +-
 .../src/main/res/values-cs/strings.xml        |   4 +-
 .../src/main/res/values-da/strings.xml        |   4 +-
 .../src/main/res/values-de/strings.xml        |   4 +-
 .../src/main/res/values-el/strings.xml        |   4 +-
 .../src/main/res/values-en-rAU/strings.xml    |   4 +-
 .../src/main/res/values-en-rCA/strings.xml    |   4 +-
 .../src/main/res/values-en-rGB/strings.xml    |   4 +-
 .../src/main/res/values-en-rIN/strings.xml    |   4 +-
 .../src/main/res/values-en-rXC/strings.xml    |   4 +-
 .../src/main/res/values-es-rUS/strings.xml    |   4 +-
 .../src/main/res/values-es/strings.xml        |   4 +-
 .../src/main/res/values-et/strings.xml        |   4 +-
 .../src/main/res/values-eu/strings.xml        |   4 +-
 .../src/main/res/values-fa/strings.xml        |   4 +-
 .../src/main/res/values-fi/strings.xml        |   4 +-
 .../src/main/res/values-fr-rCA/strings.xml    |   4 +-
 .../src/main/res/values-fr/strings.xml        |   4 +-
 .../src/main/res/values-gl/strings.xml        |   4 +-
 .../src/main/res/values-gu/strings.xml        |   4 +-
 .../src/main/res/values-hi/strings.xml        |   4 +-
 .../src/main/res/values-hr/strings.xml        |   4 +-
 .../src/main/res/values-hu/strings.xml        |   4 +-
 .../src/main/res/values-hy/strings.xml        |   4 +-
 .../src/main/res/values-in/strings.xml        |   4 +-
 .../src/main/res/values-is/strings.xml        |   4 +-
 .../src/main/res/values-it/strings.xml        |   4 +-
 .../src/main/res/values-iw/strings.xml        |   4 +-
 .../src/main/res/values-ja/strings.xml        |   4 +-
 .../src/main/res/values-ka/strings.xml        |   4 +-
 .../src/main/res/values-kk/strings.xml        |   4 +-
 .../src/main/res/values-km/strings.xml        |   4 +-
 .../src/main/res/values-kn/strings.xml        |   4 +-
 .../src/main/res/values-ko/strings.xml        |   4 +-
 .../src/main/res/values-ky/strings.xml        |   4 +-
 .../src/main/res/values-lo/strings.xml        |   4 +-
 .../src/main/res/values-lt/strings.xml        |   4 +-
 .../src/main/res/values-lv/strings.xml        |   4 +-
 .../src/main/res/values-mk/strings.xml        |   4 +-
 .../src/main/res/values-ml/strings.xml        |   4 +-
 .../src/main/res/values-mn/strings.xml        |   4 +-
 .../src/main/res/values-mr/strings.xml        |   4 +-
 .../src/main/res/values-ms/strings.xml        |   4 +-
 .../src/main/res/values-my/strings.xml        |   4 +-
 .../src/main/res/values-nb/strings.xml        |   4 +-
 .../src/main/res/values-ne/strings.xml        |   4 +-
 .../src/main/res/values-nl/strings.xml        |   4 +-
 .../src/main/res/values-or/strings.xml        |   4 +-
 .../src/main/res/values-pa/strings.xml        |   4 +-
 .../src/main/res/values-pl/strings.xml        |   4 +-
 .../src/main/res/values-pt-rBR/strings.xml    |   4 +-
 .../src/main/res/values-pt-rPT/strings.xml    |   4 +-
 .../src/main/res/values-pt/strings.xml        |   4 +-
 .../src/main/res/values-ro/strings.xml        |   4 +-
 .../src/main/res/values-ru/strings.xml        |   4 +-
 .../src/main/res/values-si/strings.xml        |   4 +-
 .../src/main/res/values-sk/strings.xml        |   4 +-
 .../src/main/res/values-sl/strings.xml        |   4 +-
 .../src/main/res/values-sq/strings.xml        |   4 +-
 .../src/main/res/values-sr/strings.xml        |   4 +-
 .../src/main/res/values-sv/strings.xml        |   4 +-
 .../src/main/res/values-sw/strings.xml        |   4 +-
 .../src/main/res/values-ta/strings.xml        |   4 +-
 .../src/main/res/values-te/strings.xml        |   4 +-
 .../src/main/res/values-th/strings.xml        |   4 +-
 .../src/main/res/values-tl/strings.xml        |   4 +-
 .../src/main/res/values-tr/strings.xml        |   4 +-
 .../src/main/res/values-uk/strings.xml        |   4 +-
 .../src/main/res/values-ur/strings.xml        |   4 +-
 .../src/main/res/values-uz/strings.xml        |   4 +-
 .../src/main/res/values-vi/strings.xml        |   4 +-
 .../src/main/res/values-zh-rCN/strings.xml    |   4 +-
 .../src/main/res/values-zh-rHK/strings.xml    |   4 +-
 .../src/main/res/values-zh-rTW/strings.xml    |   4 +-
 .../src/main/res/values-zu/strings.xml        |   4 +-
 .../session/src/main/res/values/drawables.xml |  14 ++---
 .../session/src/main/res/values/strings.xml   |  29 ++++------
 100 files changed, 137 insertions(+), 576 deletions(-)
 delete mode 100644 libraries/session/src/main/res/drawable/exo_icon_fastforward.xml
 delete mode 100644 libraries/session/src/main/res/drawable/exo_icon_next.xml
 delete mode 100644 libraries/session/src/main/res/drawable/exo_icon_pause.xml
 delete mode 100644 libraries/session/src/main/res/drawable/exo_icon_play.xml
 delete mode 100644 libraries/session/src/main/res/drawable/exo_icon_previous.xml
 delete mode 100644 libraries/session/src/main/res/drawable/exo_icon_rewind.xml
 rename libraries/session/src/main/res/drawable/{exo_icon_circular_play.png => media3_icon_circular_play.png} (100%)
 delete mode 100644 libraries/session/src/main/res/drawable/media_session_service_notification_ic_pause.xml
 delete mode 100644 libraries/session/src/main/res/drawable/media_session_service_notification_ic_play.xml
 delete mode 100644 libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_next.xml
 delete mode 100644 libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_previous.xml

diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaNotificationHandler.java b/libraries/session/src/main/java/androidx/media3/session/MediaNotificationHandler.java
index 4da53e4d37..f16f8d35e4 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaNotificationHandler.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaNotificationHandler.java
@@ -79,26 +79,26 @@ import java.util.WeakHashMap;
     playAction =
         createNotificationAction(
             service,
-            R.drawable.media_session_service_notification_ic_play,
-            R.string.play_button_content_description,
+            android.R.drawable.ic_media_play,
+            R.string.media3_controls_play_description,
             ACTION_PLAY);
     pauseAction =
         createNotificationAction(
             service,
-            R.drawable.media_session_service_notification_ic_pause,
-            R.string.pause_button_content_description,
+            android.R.drawable.ic_media_pause,
+            R.string.media3_controls_pause_description,
             ACTION_PAUSE);
     skipToPrevAction =
         createNotificationAction(
             service,
-            R.drawable.media_session_service_notification_ic_skip_to_previous,
-            R.string.skip_to_previous_item_button_content_description,
+            android.R.drawable.ic_media_previous,
+            R.string.media3_controls_seek_to_previous_description,
             ACTION_SKIP_TO_PREVIOUS);
     skipToNextAction =
         createNotificationAction(
             service,
-            R.drawable.media_session_service_notification_ic_skip_to_next,
-            R.string.skip_to_next_item_button_content_description,
+            android.R.drawable.ic_media_next,
+            R.string.media3_controls_seek_to_next_description,
             ACTION_SKIP_TO_NEXT);
 
     playerInfoMap = new WeakHashMap<>();
diff --git a/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java b/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java
index b6cd88e07e..f3ed0599b1 100644
--- a/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java
+++ b/libraries/session/src/main/java/androidx/media3/session/PlayerNotificationManager.java
@@ -82,15 +82,15 @@ import java.util.Map;
  * names defined in your application. The drawables that can be overridden are:
  *
  * <ul>
- *   <li><b>{@code exo_notification_small_icon}</b> - The icon passed by default to {@link
+ *   <li><b>{@code media3_notification_small_icon}</b> - The icon passed by default to {@link
  *       NotificationCompat.Builder#setSmallIcon(int)}. A different icon can also be specified
  *       programmatically by calling {@link #setSmallIcon(int)}.
- *   <li><b>{@code exo_notification_play}</b> - The play icon.
- *   <li><b>{@code exo_notification_pause}</b> - The pause icon.
- *   <li><b>{@code exo_notification_rewind}</b> - The rewind icon.
- *   <li><b>{@code exo_notification_fastforward}</b> - The fast forward icon.
- *   <li><b>{@code exo_notification_previous}</b> - The previous icon.
- *   <li><b>{@code exo_notification_next}</b> - The next icon.
+ *   <li><b>{@code media3_notification_play}</b> - The play icon.
+ *   <li><b>{@code media3_notification_pause}</b> - The pause icon.
+ *   <li><b>{@code media3_notification_rewind}</b> - The rewind icon.
+ *   <li><b>{@code media3_notification_fastforward}</b> - The fast forward icon.
+ *   <li><b>{@code media3_notification_previous}</b> - The previous icon.
+ *   <li><b>{@code media3_notification_next}</b> - The next icon.
  * </ul>
  *
  * <p>Alternatively, the action icons can be set programatically by using the {@link Builder}.
@@ -287,13 +287,13 @@ public class PlayerNotificationManager {
       this.channelId = channelId;
       channelImportance = NotificationUtil.IMPORTANCE_LOW;
       mediaDescriptionAdapter = new DefaultMediaDescriptionAdapter(/* pendingIntent= */ null);
-      smallIconResourceId = R.drawable.exo_notification_small_icon;
-      playActionIconResourceId = R.drawable.exo_notification_play;
-      pauseActionIconResourceId = R.drawable.exo_notification_pause;
-      rewindActionIconResourceId = R.drawable.exo_notification_rewind;
-      fastForwardActionIconResourceId = R.drawable.exo_notification_fastforward;
-      previousActionIconResourceId = R.drawable.exo_notification_previous;
-      nextActionIconResourceId = R.drawable.exo_notification_next;
+      smallIconResourceId = R.drawable.media3_notification_small_icon;
+      playActionIconResourceId = R.drawable.media3_notification_play;
+      pauseActionIconResourceId = R.drawable.media3_notification_pause;
+      rewindActionIconResourceId = R.drawable.media3_notification_seek_back;
+      fastForwardActionIconResourceId = R.drawable.media3_notification_seek_forward;
+      previousActionIconResourceId = R.drawable.media3_notification_seek_to_previous;
+      nextActionIconResourceId = R.drawable.media3_notification_seek_to_next;
     }
 
     /**
@@ -366,7 +366,7 @@ public class PlayerNotificationManager {
      * The resource id of the small icon of the notification shown in the status bar. See {@link
      * NotificationCompat.Builder#setSmallIcon(int)}.
      *
-     * <p>The default is {@code R.drawable#exo_notification_small_icon}.
+     * <p>The default is {@code R.drawable#media3_notification_small_icon}.
      *
      * @return This builder.
      */
@@ -378,7 +378,7 @@ public class PlayerNotificationManager {
     /**
      * The resource id of the drawable to be used as the icon of action {@link #ACTION_PLAY}.
      *
-     * <p>The default is {@code R.drawable#exo_notification_play}.
+     * <p>The default is {@code R.drawable#media3_notification_play}.
      *
      * @return This builder.
      */
@@ -390,7 +390,7 @@ public class PlayerNotificationManager {
     /**
      * The resource id of the drawable to be used as the icon of action {@link #ACTION_PAUSE}.
      *
-     * <p>The default is {@code R.drawable#exo_notification_pause}.
+     * <p>The default is {@code R.drawable#media3_notification_pause}.
      *
      * @return This builder.
      */
@@ -402,7 +402,7 @@ public class PlayerNotificationManager {
     /**
      * The resource id of the drawable to be used as the icon of action {@link #ACTION_REWIND}.
      *
-     * <p>The default is {@code R.drawable#exo_notification_rewind}.
+     * <p>The default is {@code R.drawable#media3_notification_rewind}.
      *
      * @return This builder.
      */
@@ -415,7 +415,7 @@ public class PlayerNotificationManager {
      * The resource id of the drawable to be used as the icon of action {@link
      * #ACTION_FAST_FORWARD}.
      *
-     * <p>The default is {@code R.drawable#exo_notification_fastforward}.
+     * <p>The default is {@code R.drawable#media3_notification_fastforward}.
      *
      * @return This builder.
      */
@@ -427,7 +427,7 @@ public class PlayerNotificationManager {
     /**
      * The resource id of the drawable to be used as the icon of action {@link #ACTION_PREVIOUS}.
      *
-     * <p>The default is {@code R.drawable#exo_notification_previous}.
+     * <p>The default is {@code R.drawable#media3_notification_previous}.
      *
      * @return This builder.
      */
@@ -439,7 +439,7 @@ public class PlayerNotificationManager {
     /**
      * The resource id of the drawable to be used as the icon of action {@link #ACTION_NEXT}.
      *
-     * <p>The default is {@code R.drawable#exo_notification_next}.
+     * <p>The default is {@code R.drawable#media3_notification_next}.
      *
      * @return This builder.
      */
@@ -1169,37 +1169,37 @@ public class PlayerNotificationManager {
         ACTION_PLAY,
         new NotificationCompat.Action(
             playActionIconResourceId,
-            context.getString(R.string.exo_controls_play_description),
+            context.getString(R.string.media3_controls_play_description),
             createBroadcastIntent(ACTION_PLAY, context, instanceId)));
     actions.put(
         ACTION_PAUSE,
         new NotificationCompat.Action(
             pauseActionIconResourceId,
-            context.getString(R.string.exo_controls_pause_description),
+            context.getString(R.string.media3_controls_pause_description),
             createBroadcastIntent(ACTION_PAUSE, context, instanceId)));
     actions.put(
         ACTION_REWIND,
         new NotificationCompat.Action(
             rewindActionIconResourceId,
-            context.getString(R.string.exo_controls_rewind_description),
+            context.getString(R.string.media3_controls_seek_back_description),
             createBroadcastIntent(ACTION_REWIND, context, instanceId)));
     actions.put(
         ACTION_FAST_FORWARD,
         new NotificationCompat.Action(
             fastForwardActionIconResourceId,
-            context.getString(R.string.exo_controls_fastforward_description),
+            context.getString(R.string.media3_controls_seek_forward_description),
             createBroadcastIntent(ACTION_FAST_FORWARD, context, instanceId)));
     actions.put(
         ACTION_PREVIOUS,
         new NotificationCompat.Action(
             previousActionIconResourceId,
-            context.getString(R.string.exo_controls_previous_description),
+            context.getString(R.string.media3_controls_seek_to_previous_description),
             createBroadcastIntent(ACTION_PREVIOUS, context, instanceId)));
     actions.put(
         ACTION_NEXT,
         new NotificationCompat.Action(
             nextActionIconResourceId,
-            context.getString(R.string.exo_controls_next_description),
+            context.getString(R.string.media3_controls_seek_to_next_description),
             createBroadcastIntent(ACTION_NEXT, context, instanceId)));
     return actions;
   }
diff --git a/libraries/session/src/main/res/drawable/exo_icon_fastforward.xml b/libraries/session/src/main/res/drawable/exo_icon_fastforward.xml
deleted file mode 100644
index 5cbd251412..0000000000
--- a/libraries/session/src/main/res/drawable/exo_icon_fastforward.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-
-</vector>
diff --git a/libraries/session/src/main/res/drawable/exo_icon_next.xml b/libraries/session/src/main/res/drawable/exo_icon_next.xml
deleted file mode 100644
index 5c17708e80..0000000000
--- a/libraries/session/src/main/res/drawable/exo_icon_next.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-
-</vector>
diff --git a/libraries/session/src/main/res/drawable/exo_icon_pause.xml b/libraries/session/src/main/res/drawable/exo_icon_pause.xml
deleted file mode 100644
index 33c5f74f2f..0000000000
--- a/libraries/session/src/main/res/drawable/exo_icon_pause.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-
-</vector>
diff --git a/libraries/session/src/main/res/drawable/exo_icon_play.xml b/libraries/session/src/main/res/drawable/exo_icon_play.xml
deleted file mode 100644
index 8ccc74be4b..0000000000
--- a/libraries/session/src/main/res/drawable/exo_icon_play.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8,5v14l11,-7z"/>
-
-</vector>
diff --git a/libraries/session/src/main/res/drawable/exo_icon_previous.xml b/libraries/session/src/main/res/drawable/exo_icon_previous.xml
deleted file mode 100644
index cd54c298eb..0000000000
--- a/libraries/session/src/main/res/drawable/exo_icon_previous.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-
-</vector>
diff --git a/libraries/session/src/main/res/drawable/exo_icon_rewind.xml b/libraries/session/src/main/res/drawable/exo_icon_rewind.xml
deleted file mode 100644
index 69123bacab..0000000000
--- a/libraries/session/src/main/res/drawable/exo_icon_rewind.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-
-</vector>
diff --git a/libraries/session/src/main/res/drawable/exo_icon_circular_play.png b/libraries/session/src/main/res/drawable/media3_icon_circular_play.png
similarity index 100%
rename from libraries/session/src/main/res/drawable/exo_icon_circular_play.png
rename to libraries/session/src/main/res/drawable/media3_icon_circular_play.png
diff --git a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_pause.xml b/libraries/session/src/main/res/drawable/media_session_service_notification_ic_pause.xml
deleted file mode 100644
index f6aa6b9bbd..0000000000
--- a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_pause.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="36dp"
-        android:height="36dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
diff --git a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_play.xml b/libraries/session/src/main/res/drawable/media_session_service_notification_ic_play.xml
deleted file mode 100644
index 2f3e025942..0000000000
--- a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_play.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="36dp"
-        android:height="36dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M8,5v14l11,-7z"/>
-</vector>
diff --git a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_next.xml b/libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_next.xml
deleted file mode 100644
index 272d4ba48c..0000000000
--- a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_next.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="36dp"
-        android:height="36dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>
diff --git a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_previous.xml b/libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_previous.xml
deleted file mode 100644
index dec2fdc10e..0000000000
--- a/libraries/session/src/main/res/drawable/media_session_service_notification_ic_skip_to_previous.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="36dp"
-        android:height="36dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>
diff --git a/libraries/session/src/main/res/values-af/strings.xml b/libraries/session/src/main/res/values-af/strings.xml
index 2b218f5a35..7deb093396 100644
--- a/libraries/session/src/main/res/values-af/strings.xml
+++ b/libraries/session/src/main/res/values-af/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Speel tans"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Speel"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Onderbreek"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Slaan oor na vorige item"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Slaan oor na volgende item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Onderbreek"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-am/strings.xml b/libraries/session/src/main/res/values-am/strings.xml
index 2334a9be2f..7dddf22792 100644
--- a/libraries/session/src/main/res/values-am/strings.xml
+++ b/libraries/session/src/main/res/values-am/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"አሁን እየተጫወተ ያለ"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"አጫውት"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"ላፍታ አቁም"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"ወደ ቀዳሚው ንጥል ዝለል"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"ወደ ቀጣዩ ንጥል ዝለል"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"ላፍታ አቁም"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ar/strings.xml b/libraries/session/src/main/res/values-ar/strings.xml
index 87acf94010..31f398c651 100644
--- a/libraries/session/src/main/res/values-ar/strings.xml
+++ b/libraries/session/src/main/res/values-ar/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"التعرف التلقائي على الوسائط"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"تشغيل"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"إيقاف مؤقت"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"التخطي إلى العنصر السابق"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"التخطي إلى العنصر التالي"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"إيقاف مؤقت"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-as/strings.xml b/libraries/session/src/main/res/values-as/strings.xml
index 0f1be723d4..b372eb08ba 100644
--- a/libraries/session/src/main/res/values-as/strings.xml
+++ b/libraries/session/src/main/res/values-as/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"এতিয়া প্লে’ হৈ আছে"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"প্লে’ কৰক"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"পজ কৰক"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"এটা এৰি তাৰ পূৰ্বৱৰ্তী বস্তুটোলৈ যাওক"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"এটা এৰি তাৰ পৰৱৰ্তী বস্তুটোলৈ যাওক"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"পজ কৰক"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-az/strings.xml b/libraries/session/src/main/res/values-az/strings.xml
index fd8b4f2656..e535d37879 100644
--- a/libraries/session/src/main/res/values-az/strings.xml
+++ b/libraries/session/src/main/res/values-az/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"İndi oxudulur"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Oxudun"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Durdurun"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Əvvəlki elementə keçin"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Növbəti elementə keçin"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Durdurun"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-b+sr+Latn/strings.xml b/libraries/session/src/main/res/values-b+sr+Latn/strings.xml
index 642e80f0c2..7e1c5d6748 100644
--- a/libraries/session/src/main/res/values-b+sr+Latn/strings.xml
+++ b/libraries/session/src/main/res/values-b+sr+Latn/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Trenutno svira"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Pusti"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pauziraj"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Pređi na prethodnu stavku"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Pređi na sledeću stavku"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pauziraj"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-be/strings.xml b/libraries/session/src/main/res/values-be/strings.xml
index 0f1a9ca674..b8e3621b58 100644
--- a/libraries/session/src/main/res/values-be/strings.xml
+++ b/libraries/session/src/main/res/values-be/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Зараз іграе"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Прайграць"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Прыпыніць"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Перайсці да папярэдняга элемента"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Перайсці да наступнага элемента"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Прыпыніць"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-bg/strings.xml b/libraries/session/src/main/res/values-bg/strings.xml
index 8727a09a8a..3e7f9b0d15 100644
--- a/libraries/session/src/main/res/values-bg/strings.xml
+++ b/libraries/session/src/main/res/values-bg/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Възпроизвежда се в момента"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Пускане"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Поставяне на пауза"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Преминаване към предишния елемент"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Преминаване към следващия елемент"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Поставяне на пауза"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-bn/strings.xml b/libraries/session/src/main/res/values-bn/strings.xml
index 4a816d016a..6dd7e8dfe2 100644
--- a/libraries/session/src/main/res/values-bn/strings.xml
+++ b/libraries/session/src/main/res/values-bn/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"এখন চলছে"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"চালান"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"পজ করুন"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"পূর্ববর্তী আইটেমে যান"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"পরবর্তী আইটেমে যান"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"পজ করুন"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-bs/strings.xml b/libraries/session/src/main/res/values-bs/strings.xml
index 2354f80285..142fc2bfde 100644
--- a/libraries/session/src/main/res/values-bs/strings.xml
+++ b/libraries/session/src/main/res/values-bs/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Trenutno se reproducira"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Reproduciranje"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pauza"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Preskok na prethodnu stavku"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Preskok na sljedeću stavku"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pauza"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ca/strings.xml b/libraries/session/src/main/res/values-ca/strings.xml
index a216a5abf3..195a264aef 100644
--- a/libraries/session/src/main/res/values-ca/strings.xml
+++ b/libraries/session/src/main/res/values-ca/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Està sonant"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Reprodueix"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Posa en pausa"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Ves a l\'element anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Ves a l\'element següent"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Posa en pausa"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-cs/strings.xml b/libraries/session/src/main/res/values-cs/strings.xml
index c95de94036..182f4e9b99 100644
--- a/libraries/session/src/main/res/values-cs/strings.xml
+++ b/libraries/session/src/main/res/values-cs/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Přehrává se"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Přehrát"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pozastavit"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Přejít na předchozí položku"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Přejít na další položku"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pozastavit"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-da/strings.xml b/libraries/session/src/main/res/values-da/strings.xml
index b7583eb24f..105e93f97e 100644
--- a/libraries/session/src/main/res/values-da/strings.xml
+++ b/libraries/session/src/main/res/values-da/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Afspilles nu"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Afspil"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Sæt på pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Gå til forrige element"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Gå til næste element"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Sæt på pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-de/strings.xml b/libraries/session/src/main/res/values-de/strings.xml
index 3e9b97d25a..91d0f6b041 100644
--- a/libraries/session/src/main/res/values-de/strings.xml
+++ b/libraries/session/src/main/res/values-de/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now Playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Wiedergeben"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pausieren"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Zum vorherigen Titel springen"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Zum nächsten Titel springen"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pausieren"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-el/strings.xml b/libraries/session/src/main/res/values-el/strings.xml
index a7a786feaf..e5496a5689 100644
--- a/libraries/session/src/main/res/values-el/strings.xml
+++ b/libraries/session/src/main/res/values-el/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Ακούγεται τώρα"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Αναπαραγωγή"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Παύση"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Μετάβαση στο προηγούμενο στοιχείο"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Μετάβαση στο επόμενο στοιχείο"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Παύση"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rAU/strings.xml b/libraries/session/src/main/res/values-en-rAU/strings.xml
index 7b0df4075a..4bef327feb 100644
--- a/libraries/session/src/main/res/values-en-rAU/strings.xml
+++ b/libraries/session/src/main/res/values-en-rAU/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Play"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Skip to previous item"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Skip to next item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rCA/strings.xml b/libraries/session/src/main/res/values-en-rCA/strings.xml
index 7b0df4075a..4bef327feb 100644
--- a/libraries/session/src/main/res/values-en-rCA/strings.xml
+++ b/libraries/session/src/main/res/values-en-rCA/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Play"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Skip to previous item"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Skip to next item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rGB/strings.xml b/libraries/session/src/main/res/values-en-rGB/strings.xml
index 7b0df4075a..4bef327feb 100644
--- a/libraries/session/src/main/res/values-en-rGB/strings.xml
+++ b/libraries/session/src/main/res/values-en-rGB/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Play"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Skip to previous item"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Skip to next item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rIN/strings.xml b/libraries/session/src/main/res/values-en-rIN/strings.xml
index 7b0df4075a..4bef327feb 100644
--- a/libraries/session/src/main/res/values-en-rIN/strings.xml
+++ b/libraries/session/src/main/res/values-en-rIN/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Play"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Skip to previous item"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Skip to next item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rXC/strings.xml b/libraries/session/src/main/res/values-en-rXC/strings.xml
index 1313932158..3f2c3f3c0a 100644
--- a/libraries/session/src/main/res/values-en-rXC/strings.xml
+++ b/libraries/session/src/main/res/values-en-rXC/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎Now playing‎‏‎‎‏‎"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎Play‎‏‎‎‏‎"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎Pause‎‏‎‎‏‎"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎Skip to previous item‎‏‎‎‏‎"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎Skip to next item‎‏‎‎‏‎"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎Pause‎‏‎‎‏‎"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-es-rUS/strings.xml b/libraries/session/src/main/res/values-es-rUS/strings.xml
index 581d2578c4..9f621e7eff 100644
--- a/libraries/session/src/main/res/values-es-rUS/strings.xml
+++ b/libraries/session/src/main/res/values-es-rUS/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"En reproducción"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Reproducir"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pausar"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Ir al elemento anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Ir al siguiente elemento"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pausar"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-es/strings.xml b/libraries/session/src/main/res/values-es/strings.xml
index f679d62b6f..e82030e52b 100644
--- a/libraries/session/src/main/res/values-es/strings.xml
+++ b/libraries/session/src/main/res/values-es/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Está sonando"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Reproducir"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pausar"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Saltar al elemento anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Saltar al siguiente elemento"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pausar"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-et/strings.xml b/libraries/session/src/main/res/values-et/strings.xml
index 8933aec5a8..e3a60f94ea 100644
--- a/libraries/session/src/main/res/values-et/strings.xml
+++ b/libraries/session/src/main/res/values-et/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Hetkel mängimas"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Esitamine"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Peatamine"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Eelmise üksuse juurde liikumine"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Järgmise üksuse juurde liikumine"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Peatamine"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-eu/strings.xml b/libraries/session/src/main/res/values-eu/strings.xml
index 0d53ac5a61..c343bb208f 100644
--- a/libraries/session/src/main/res/values-eu/strings.xml
+++ b/libraries/session/src/main/res/values-eu/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Orain erreproduzitzen"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Erreproduzitu"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pausatu"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Joan aurreko elementura"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Joan hurrengo elementura"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pausatu"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fa/strings.xml b/libraries/session/src/main/res/values-fa/strings.xml
index a1ef671551..e9f360fb4e 100644
--- a/libraries/session/src/main/res/values-fa/strings.xml
+++ b/libraries/session/src/main/res/values-fa/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"درحال پخش"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"پخش"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"مکث"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"پرش به مورد قبلی"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"پرش به مورد بعدی"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"مکث"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fi/strings.xml b/libraries/session/src/main/res/values-fi/strings.xml
index bd76c9bce6..b7ce7e2e02 100644
--- a/libraries/session/src/main/res/values-fi/strings.xml
+++ b/libraries/session/src/main/res/values-fi/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Nyt toistetaan"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Toista"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Keskeytä"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Siirry edelliseen"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Siirry seuraavaan"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Keskeytä"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fr-rCA/strings.xml b/libraries/session/src/main/res/values-fr-rCA/strings.xml
index b039cf31af..e219255900 100644
--- a/libraries/session/src/main/res/values-fr-rCA/strings.xml
+++ b/libraries/session/src/main/res/values-fr-rCA/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"En cours de lecture"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Lire"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Passer à l\'élément précédent"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Passer à l\'élément suivant"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fr/strings.xml b/libraries/session/src/main/res/values-fr/strings.xml
index 219bd453aa..4a4ad3ec2c 100644
--- a/libraries/session/src/main/res/values-fr/strings.xml
+++ b/libraries/session/src/main/res/values-fr/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"En écoute"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Lire"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Passer à l\'élément précédent"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Passer à l\'élément suivant"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-gl/strings.xml b/libraries/session/src/main/res/values-gl/strings.xml
index bb390153ea..91b8c093b5 100644
--- a/libraries/session/src/main/res/values-gl/strings.xml
+++ b/libraries/session/src/main/res/values-gl/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Reproducindo"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Reproducir"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pór en pausa"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Omitir o elemento e ir ao anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Omitir o elemento e ir ao seguinte"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pór en pausa"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-gu/strings.xml b/libraries/session/src/main/res/values-gu/strings.xml
index 1e64b2258e..0040d0841d 100644
--- a/libraries/session/src/main/res/values-gu/strings.xml
+++ b/libraries/session/src/main/res/values-gu/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"હાલમાં ચાલી રહ્યું છે"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ચલાવો"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"થોભાવો"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"પહેલાંની આઇટમ પર જાઓ"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"આગલી આઇટમ પર જાઓ"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"થોભાવો"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hi/strings.xml b/libraries/session/src/main/res/values-hi/strings.xml
index 774d02ca2e..d6d9dc40f6 100644
--- a/libraries/session/src/main/res/values-hi/strings.xml
+++ b/libraries/session/src/main/res/values-hi/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"अभी चल रहा है"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"चलाएं"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"रोकें"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"पिछले आइटम पर जाएं"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"अगले आइटम पर जाएं"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"रोकें"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hr/strings.xml b/libraries/session/src/main/res/values-hr/strings.xml
index 284694fd3e..305bd89683 100644
--- a/libraries/session/src/main/res/values-hr/strings.xml
+++ b/libraries/session/src/main/res/values-hr/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Sada se reproducira"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Reproduciraj"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pauziraj"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Preskoči na prethodnu stavku"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Preskoči na sljedeću stavku"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pauziraj"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hu/strings.xml b/libraries/session/src/main/res/values-hu/strings.xml
index bf54bd9159..e3d8a567db 100644
--- a/libraries/session/src/main/res/values-hu/strings.xml
+++ b/libraries/session/src/main/res/values-hu/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Most játszott tartalom"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Lejátszás"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Szünet"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Ugrás az előző elemre"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Ugrás a következő elemre"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Szünet"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hy/strings.xml b/libraries/session/src/main/res/values-hy/strings.xml
index 7b9443e095..f0b1b31b85 100644
--- a/libraries/session/src/main/res/values-hy/strings.xml
+++ b/libraries/session/src/main/res/values-hy/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Այժմ հնչում է"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Նվագարկել"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Դադարեցնել"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Անցնել նախորդ տարրին"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Անցնել հաջորդ տարրին"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Դադարեցնել"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-in/strings.xml b/libraries/session/src/main/res/values-in/strings.xml
index 4afd084029..24b89c9117 100644
--- a/libraries/session/src/main/res/values-in/strings.xml
+++ b/libraries/session/src/main/res/values-in/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Sedang diputar"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Putar"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Jeda"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Lewati ke item sebelumnya"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Lewati ke item berikutnya"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Jeda"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-is/strings.xml b/libraries/session/src/main/res/values-is/strings.xml
index b734aff600..b52418a974 100644
--- a/libraries/session/src/main/res/values-is/strings.xml
+++ b/libraries/session/src/main/res/values-is/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Í spilun"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Spila"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Gera hlé"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Fara í fyrra atriði"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Fara í næsta atriði"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Gera hlé"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-it/strings.xml b/libraries/session/src/main/res/values-it/strings.xml
index 7f52bd2cad..0c0d88b68e 100644
--- a/libraries/session/src/main/res/values-it/strings.xml
+++ b/libraries/session/src/main/res/values-it/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Ora in riproduzione"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Riproduci"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Metti in pausa"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Vai all\'elemento precedente"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Vai all\'elemento successivo"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Metti in pausa"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-iw/strings.xml b/libraries/session/src/main/res/values-iw/strings.xml
index e10750ae2a..f176f0571d 100644
--- a/libraries/session/src/main/res/values-iw/strings.xml
+++ b/libraries/session/src/main/res/values-iw/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"פועל עכשיו"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"הפעלה"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"השהיה"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"דילוג לפריט הקודם"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"דילוג לפריט הבא"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"השהיה"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ja/strings.xml b/libraries/session/src/main/res/values-ja/strings.xml
index 4714e3176d..509db795bb 100644
--- a/libraries/session/src/main/res/values-ja/strings.xml
+++ b/libraries/session/src/main/res/values-ja/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"再生中"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"再生"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"一時停止"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"前の項目にスキップ"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"次の項目にスキップ"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"一時停止"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ka/strings.xml b/libraries/session/src/main/res/values-ka/strings.xml
index 6a03150497..8a1efbc7d1 100644
--- a/libraries/session/src/main/res/values-ka/strings.xml
+++ b/libraries/session/src/main/res/values-ka/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ამჟამად უკრავს"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"დაკვრა"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"პაუზა"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"წინა ერთეულზე გადასვლა"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"შემდეგ ერთეულზე გადასვლა"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"პაუზა"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-kk/strings.xml b/libraries/session/src/main/res/values-kk/strings.xml
index 44c6089ff1..3c0b9faf4a 100644
--- a/libraries/session/src/main/res/values-kk/strings.xml
+++ b/libraries/session/src/main/res/values-kk/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Ойнатылуда"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Ойнату"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Кідірту"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Алдыңғы элементке өткізіп жіберу"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Келесі элементке өткізіп жіберу"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Кідірту"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-km/strings.xml b/libraries/session/src/main/res/values-km/strings.xml
index ee9817f8d0..f359099e7a 100644
--- a/libraries/session/src/main/res/values-km/strings.xml
+++ b/libraries/session/src/main/res/values-km/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"កំពុងចាក់"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ចាក់"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"ផ្អាក"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"រំលងទៅមេឌៀមុន"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"រំលងទៅមេឌៀបន្ទាប់"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"ផ្អាក"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-kn/strings.xml b/libraries/session/src/main/res/values-kn/strings.xml
index d8206dc07d..3c0216aab1 100644
--- a/libraries/session/src/main/res/values-kn/strings.xml
+++ b/libraries/session/src/main/res/values-kn/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ಇದೀಗ ಪ್ಲೇ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ಪ್ಲೇ ಮಾಡಿ"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"ವಿರಾಮಗೊಳಿಸಿ"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"ಹಿಂದಿನ ಐಟಂಗೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"ಮುಂದಿನ ಐಟಂಗೆ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"ವಿರಾಮಗೊಳಿಸಿ"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ko/strings.xml b/libraries/session/src/main/res/values-ko/strings.xml
index 1b0e13af98..288dd9f42c 100644
--- a/libraries/session/src/main/res/values-ko/strings.xml
+++ b/libraries/session/src/main/res/values-ko/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"지금 재생 중인 미디어 이름"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"재생"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"일시중지"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"이전 항목으로 건너뛰기"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"다음 항목으로 건너뛰기"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"일시중지"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ky/strings.xml b/libraries/session/src/main/res/values-ky/strings.xml
index 6d6af6ddc0..db858c5373 100644
--- a/libraries/session/src/main/res/values-ky/strings.xml
+++ b/libraries/session/src/main/res/values-ky/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Эмне ойноп жатат?"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Ойнотуу"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Тындыруу"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Мурунку нерсеге өтүү"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Кийинки нерсеге өтүү"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Тындыруу"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-lo/strings.xml b/libraries/session/src/main/res/values-lo/strings.xml
index cfb99a262f..fb4898704a 100644
--- a/libraries/session/src/main/res/values-lo/strings.xml
+++ b/libraries/session/src/main/res/values-lo/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ກຳລັງຫຼິ້ນ"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ຫຼິ້ນ"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"ຢຸດຊົ່ວຄາວ"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"ຂ້າມໄປລາຍການກ່ອນໜ້າ"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"ຂ້າມໄປລາຍການຕໍ່ໄປ"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"ຢຸດຊົ່ວຄາວ"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-lt/strings.xml b/libraries/session/src/main/res/values-lt/strings.xml
index c15654c06c..19a72dfeb9 100644
--- a/libraries/session/src/main/res/values-lt/strings.xml
+++ b/libraries/session/src/main/res/values-lt/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Dabar leidžiama"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Leisti"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pristabdyti"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Pereiti prie ankstesnio elemento"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Pereiti prie kito elemento"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pristabdyti"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-lv/strings.xml b/libraries/session/src/main/res/values-lv/strings.xml
index 9d7edff13d..f51f7d56ed 100644
--- a/libraries/session/src/main/res/values-lv/strings.xml
+++ b/libraries/session/src/main/res/values-lv/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Tagad atskaņo"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Atskaņot"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Apturēt"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Pāriet uz iepriekšējo vienumu"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Pāriet uz nākamo vienumu"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Apturēt"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-mk/strings.xml b/libraries/session/src/main/res/values-mk/strings.xml
index 1f3ee24bfe..ee5ee278c6 100644
--- a/libraries/session/src/main/res/values-mk/strings.xml
+++ b/libraries/session/src/main/res/values-mk/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now Playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Пушти"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Паузирај"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Скокни на претходната ставка"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Скокни на следната ставка"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Паузирај"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ml/strings.xml b/libraries/session/src/main/res/values-ml/strings.xml
index bab4b55b14..61b472f079 100644
--- a/libraries/session/src/main/res/values-ml/strings.xml
+++ b/libraries/session/src/main/res/values-ml/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ഇപ്പോൾ പ്ലേ ചെയ്യുന്നത്"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"പ്ലേ ചെയ്യുക"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"താൽക്കാലികമായി നിർത്തുക"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"മുമ്പത്തെ ഇനത്തിലേക്ക് പോകുക"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"അടുത്ത ഇനത്തിലേക്ക് പോകുക"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"താൽക്കാലികമായി നിർത്തുക"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-mn/strings.xml b/libraries/session/src/main/res/values-mn/strings.xml
index c963b5ecae..479157348b 100644
--- a/libraries/session/src/main/res/values-mn/strings.xml
+++ b/libraries/session/src/main/res/values-mn/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Одоо тоглуулж байна"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Тоглуулах"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Түр зогсоох"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Өмнөх зүйл рүү алгасах"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Дараагийн зүйл рүү алгасах"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Түр зогсоох"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-mr/strings.xml b/libraries/session/src/main/res/values-mr/strings.xml
index cc9584ad01..bed625b301 100644
--- a/libraries/session/src/main/res/values-mr/strings.xml
+++ b/libraries/session/src/main/res/values-mr/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"आता प्ले करत आहे"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"प्ले करा"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"थांबवा"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"मागील आयटमवर जा"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"पुढील आयटमवर जा"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"थांबवा"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ms/strings.xml b/libraries/session/src/main/res/values-ms/strings.xml
index 9e2daa2b20..2d0048ab07 100644
--- a/libraries/session/src/main/res/values-ms/strings.xml
+++ b/libraries/session/src/main/res/values-ms/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Sedang dimainkan"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Main"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Jeda"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Langkau ke item sebelumnya"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Langkau ke item seterusnya"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Jeda"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-my/strings.xml b/libraries/session/src/main/res/values-my/strings.xml
index 13710d25f3..7015628aa8 100644
--- a/libraries/session/src/main/res/values-my/strings.xml
+++ b/libraries/session/src/main/res/values-my/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now Playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ဖွင့်ရန်"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"ခဏရပ်ရန်"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"ယခင်တစ်ခုသို့ ပြန်သွားရန်"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"နောက်တစ်ခုသို့ ကျော်ရန်"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"ခဏရပ်ရန်"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-nb/strings.xml b/libraries/session/src/main/res/values-nb/strings.xml
index 32bf8aa4cb..99ea8ec5c4 100644
--- a/libraries/session/src/main/res/values-nb/strings.xml
+++ b/libraries/session/src/main/res/values-nb/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Spilles nå"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Spill av"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Sett på pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Gå tilbake til det forrige elementet"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Hopp til det neste elementet"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Sett på pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ne/strings.xml b/libraries/session/src/main/res/values-ne/strings.xml
index 111ef1d3f6..1d938afa28 100644
--- a/libraries/session/src/main/res/values-ne/strings.xml
+++ b/libraries/session/src/main/res/values-ne/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"प्ले गर्नुहोस्"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"पज गर्नुहोस्"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"अघिल्लो वस्तुमा जानुहोस्"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"अर्को वस्तुमा जानुहोस्"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"पज गर्नुहोस्"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-nl/strings.xml b/libraries/session/src/main/res/values-nl/strings.xml
index 606ce7a56f..0b220a2e0c 100644
--- a/libraries/session/src/main/res/values-nl/strings.xml
+++ b/libraries/session/src/main/res/values-nl/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Wordt nu afgespeeld"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Afspelen"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pauzeren"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Overslaan en naar vorig item"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Overslaan en naar volgend item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pauzeren"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-or/strings.xml b/libraries/session/src/main/res/values-or/strings.xml
index 93ed416700..ca20ed37cc 100644
--- a/libraries/session/src/main/res/values-or/strings.xml
+++ b/libraries/session/src/main/res/values-or/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ଏବେ ଚାଲୁଛି"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ଚଲାନ୍ତୁ"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"ବିରତ କରନ୍ତୁ"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"ପୂର୍ବବର୍ତ୍ତୀ ଆଇଟମକୁ ଯାଆନ୍ତୁ"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"ପରବର୍ତ୍ତୀ ଆଇଟମକୁ ଯାଆନ୍ତୁ"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"ବିରତ କରନ୍ତୁ"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pa/strings.xml b/libraries/session/src/main/res/values-pa/strings.xml
index f504f5057d..75b56f1489 100644
--- a/libraries/session/src/main/res/values-pa/strings.xml
+++ b/libraries/session/src/main/res/values-pa/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ਹੁਣੇ ਚੱਲ ਰਿਹਾ ਹੈ"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ਚਲਾਓ"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"ਰੋਕੋ"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"ਪਿਛਲੀ ਆਈਟਮ \'ਤੇ ਜਾਓ"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"ਅਗਲੀ ਆਈਟਮ \'ਤੇ ਜਾਓ"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"ਰੋਕੋ"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pl/strings.xml b/libraries/session/src/main/res/values-pl/strings.xml
index c497bdd0bd..b61a07ffe3 100644
--- a/libraries/session/src/main/res/values-pl/strings.xml
+++ b/libraries/session/src/main/res/values-pl/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Co jest grane"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Odtwórz"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Wstrzymaj"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Przeskocz do poprzedniego elementu"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Przeskocz do następnego elementu"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Wstrzymaj"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pt-rBR/strings.xml b/libraries/session/src/main/res/values-pt-rBR/strings.xml
index 80311b2bb3..aa1c5ec338 100644
--- a/libraries/session/src/main/res/values-pt-rBR/strings.xml
+++ b/libraries/session/src/main/res/values-pt-rBR/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Tocando agora"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Iniciar"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pausar"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Voltar para o item anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Pular para o próximo item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pausar"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pt-rPT/strings.xml b/libraries/session/src/main/res/values-pt-rPT/strings.xml
index b007850aff..5349a90153 100644
--- a/libraries/session/src/main/res/values-pt-rPT/strings.xml
+++ b/libraries/session/src/main/res/values-pt-rPT/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"A reproduzir"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Reproduzir"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Colocar em pausa"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Ir para o item anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Ir para o item seguinte"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Colocar em pausa"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pt/strings.xml b/libraries/session/src/main/res/values-pt/strings.xml
index 80311b2bb3..aa1c5ec338 100644
--- a/libraries/session/src/main/res/values-pt/strings.xml
+++ b/libraries/session/src/main/res/values-pt/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Tocando agora"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Iniciar"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pausar"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Voltar para o item anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Pular para o próximo item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pausar"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ro/strings.xml b/libraries/session/src/main/res/values-ro/strings.xml
index 0e8c25b0fd..4171336db6 100644
--- a/libraries/session/src/main/res/values-ro/strings.xml
+++ b/libraries/session/src/main/res/values-ro/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Now Playing"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Redați"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Întrerupeți"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Treceți la elementul anterior"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Treceți la elementul următor"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Întrerupeți"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ru/strings.xml b/libraries/session/src/main/res/values-ru/strings.xml
index ff54cacf22..2a9f63eb64 100644
--- a/libraries/session/src/main/res/values-ru/strings.xml
+++ b/libraries/session/src/main/res/values-ru/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Текущий медиафайл"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Воспроизвести"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Приостановить"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Перейти к предыдущему файлу"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Перейти к следующему файлу"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Приостановить"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-si/strings.xml b/libraries/session/src/main/res/values-si/strings.xml
index bd244dcdc6..0af39e85f7 100644
--- a/libraries/session/src/main/res/values-si/strings.xml
+++ b/libraries/session/src/main/res/values-si/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"දැන් වාදනය වේ"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"වාදනය කරන්න"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"විරාම ගන්වන්න"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"පෙර අයිතමය වෙත යන්න"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"ඊළඟ අයිතමය වෙත යන්න"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"විරාම ගන්වන්න"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sk/strings.xml b/libraries/session/src/main/res/values-sk/strings.xml
index 0aab75e5a0..1fe225dfea 100644
--- a/libraries/session/src/main/res/values-sk/strings.xml
+++ b/libraries/session/src/main/res/values-sk/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Prehráva sa"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Prehrať"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pozastaviť"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Preskočiť na predchádzajúcu položku"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Preskočiť na ďalšiu položku"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pozastaviť"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sl/strings.xml b/libraries/session/src/main/res/values-sl/strings.xml
index cfa794b531..b838b629ae 100644
--- a/libraries/session/src/main/res/values-sl/strings.xml
+++ b/libraries/session/src/main/res/values-sl/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Zdaj se predvaja"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Predvajanje"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Začasna zaustavitev"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Preskok na prejšnji element"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Preskok na naslednji element"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Začasna zaustavitev"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sq/strings.xml b/libraries/session/src/main/res/values-sq/strings.xml
index 24e8fa7057..ccdedf57d8 100644
--- a/libraries/session/src/main/res/values-sq/strings.xml
+++ b/libraries/session/src/main/res/values-sq/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Po luhet tani"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Luaj"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Vendos në pauzë"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Kapërce tek artikulli i mëparshëm"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Kapërce tek artikulli tjetër"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Vendos në pauzë"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sr/strings.xml b/libraries/session/src/main/res/values-sr/strings.xml
index 8bf6a2ce8f..fef4b4feea 100644
--- a/libraries/session/src/main/res/values-sr/strings.xml
+++ b/libraries/session/src/main/res/values-sr/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Тренутно свира"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Пусти"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Паузирај"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Пређи на претходну ставку"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Пређи на следећу ставку"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Паузирај"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sv/strings.xml b/libraries/session/src/main/res/values-sv/strings.xml
index f52d452d9c..baeabaa725 100644
--- a/libraries/session/src/main/res/values-sv/strings.xml
+++ b/libraries/session/src/main/res/values-sv/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Spelas just nu"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Spela upp"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pausa"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Hoppa till föregående objekt"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Hoppa till nästa objekt"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pausa"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sw/strings.xml b/libraries/session/src/main/res/values-sw/strings.xml
index 65713552bf..834e843233 100644
--- a/libraries/session/src/main/res/values-sw/strings.xml
+++ b/libraries/session/src/main/res/values-sw/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Inayocheza sasa"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Cheza"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Simamisha"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Rudi kwenye kipengee kilichotangulia"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Nenda kwenye kipengee kinachofuata"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Simamisha"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ta/strings.xml b/libraries/session/src/main/res/values-ta/strings.xml
index 29fe641e6c..92bb38f209 100644
--- a/libraries/session/src/main/res/values-ta/strings.xml
+++ b/libraries/session/src/main/res/values-ta/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"இப்போது பிளே செய்வது"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"பிளே செய்யும்"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"இடைநிறுத்தும்"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"முந்தையதற்குச் செல்லும்"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"அடுத்ததற்குச் செல்லும்"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"இடைநிறுத்தும்"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-te/strings.xml b/libraries/session/src/main/res/values-te/strings.xml
index acfa1d9d9b..327888b35f 100644
--- a/libraries/session/src/main/res/values-te/strings.xml
+++ b/libraries/session/src/main/res/values-te/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ప్రస్తుతం ప్లే అవుతున్నది"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"ప్లే చేయి"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"పాజ్ చేయి"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"మునుపటి ఐటెమ్‌కు స్కిప్ చేయి"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"తర్వాత ఐటెమ్‌కు స్కిప్ చేయి"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"పాజ్ చేయి"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-th/strings.xml b/libraries/session/src/main/res/values-th/strings.xml
index 17136a7f67..c8c0edc1af 100644
--- a/libraries/session/src/main/res/values-th/strings.xml
+++ b/libraries/session/src/main/res/values-th/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"กำลังเล่น"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"เล่น"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"หยุดชั่วคราว"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"ข้ามไปยังรายการก่อนหน้า"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"ข้ามไปยังรายการถัดไป"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"หยุดชั่วคราว"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-tl/strings.xml b/libraries/session/src/main/res/values-tl/strings.xml
index d56624b969..ba1546ebc5 100644
--- a/libraries/session/src/main/res/values-tl/strings.xml
+++ b/libraries/session/src/main/res/values-tl/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Nagpi-play ngayon"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"I-play"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"I-pause"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Lumaktaw sa nakaraang item"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Lumaktaw sa susunod na item"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"I-pause"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-tr/strings.xml b/libraries/session/src/main/res/values-tr/strings.xml
index 8eff6450ea..be36e99bca 100644
--- a/libraries/session/src/main/res/values-tr/strings.xml
+++ b/libraries/session/src/main/res/values-tr/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Şimdi oynatılıyor"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Oynat"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Duraklat"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Önceki öğeye atla"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Sonraki öğeye atla"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Duraklat"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-uk/strings.xml b/libraries/session/src/main/res/values-uk/strings.xml
index f805eabd1c..3ea92c1ca6 100644
--- a/libraries/session/src/main/res/values-uk/strings.xml
+++ b/libraries/session/src/main/res/values-uk/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Зараз грає"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Відтворити"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Призупинити"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Перейти до попереднього медіафайлу"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Перейти до наступного медіафайлу"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Призупинити"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ur/strings.xml b/libraries/session/src/main/res/values-ur/strings.xml
index 5e36503958..9120f01858 100644
--- a/libraries/session/src/main/res/values-ur/strings.xml
+++ b/libraries/session/src/main/res/values-ur/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"ابھی چل رہا ہے"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"چلائیں"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"موقوف کریں"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"پچھلے آئٹم پر جائیں"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"اگلے آئٹم پر جائیں"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"موقوف کریں"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-uz/strings.xml b/libraries/session/src/main/res/values-uz/strings.xml
index 606c44f9cd..6005d69e1e 100644
--- a/libraries/session/src/main/res/values-uz/strings.xml
+++ b/libraries/session/src/main/res/values-uz/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Bu qaysi musiqa"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Ijro"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Pauza"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Avvalgi obyektga oʻtish"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Keyingi obyektga oʻtish"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Pauza"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-vi/strings.xml b/libraries/session/src/main/res/values-vi/strings.xml
index 12e0e99ff5..72ccd63933 100644
--- a/libraries/session/src/main/res/values-vi/strings.xml
+++ b/libraries/session/src/main/res/values-vi/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Đang phát"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Phát"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Tạm dừng"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Chuyển về mục trước đó"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Chuyển đến mục tiếp theo"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Tạm dừng"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zh-rCN/strings.xml b/libraries/session/src/main/res/values-zh-rCN/strings.xml
index 19276e68d1..782a21b357 100644
--- a/libraries/session/src/main/res/values-zh-rCN/strings.xml
+++ b/libraries/session/src/main/res/values-zh-rCN/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"正在播放"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"播放"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"暂停"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"跳至上一项"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"跳至下一项"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"暂停"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zh-rHK/strings.xml b/libraries/session/src/main/res/values-zh-rHK/strings.xml
index 1f8a61cc21..f592e6e578 100644
--- a/libraries/session/src/main/res/values-zh-rHK/strings.xml
+++ b/libraries/session/src/main/res/values-zh-rHK/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"現正播放"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"播放"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"暫停"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"跳去上一個項目"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"跳去下一個項目"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"暫停"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zh-rTW/strings.xml b/libraries/session/src/main/res/values-zh-rTW/strings.xml
index b056fa7600..f592e6e578 100644
--- a/libraries/session/src/main/res/values-zh-rTW/strings.xml
+++ b/libraries/session/src/main/res/values-zh-rTW/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"現正播放"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"播放"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"暫停"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"跳到上一個項目"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"跳到下一個項目"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"暫停"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zu/strings.xml b/libraries/session/src/main/res/values-zu/strings.xml
index 4e42ec24d1..3db02bff28 100644
--- a/libraries/session/src/main/res/values-zu/strings.xml
+++ b/libraries/session/src/main/res/values-zu/strings.xml
@@ -19,7 +19,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="default_notification_channel_name" msgid="7213672915724563695">"Okudlala manje"</string>
     <string name="play_button_content_description" msgid="963503759453979404">"Dlala"</string>
-    <string name="pause_button_content_description" msgid="3510124037191104584">"Phumula"</string>
-    <string name="skip_to_previous_item_button_content_description" msgid="4352480799561670760">"Yeqela entweni yangaphambilini"</string>
-    <string name="skip_to_next_item_button_content_description" msgid="6034072145387511457">"Yeqela entweni elandelayo"</string>
+    <string name="media3_controls_pause_description" msgid="3510124037191104584">"Phumula"</string>
 </resources>
diff --git a/libraries/session/src/main/res/values/drawables.xml b/libraries/session/src/main/res/values/drawables.xml
index cf9fd833c1..701da2f8dd 100644
--- a/libraries/session/src/main/res/values/drawables.xml
+++ b/libraries/session/src/main/res/values/drawables.xml
@@ -14,11 +14,11 @@
      limitations under the License.
 -->
 <resources>
-  <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>
-  <drawable name="exo_notification_previous">@drawable/exo_icon_previous</drawable>
-  <drawable name="exo_notification_fastforward">@drawable/exo_icon_fastforward</drawable>
-  <drawable name="exo_notification_rewind">@drawable/exo_icon_rewind</drawable>
-  <drawable name="exo_notification_small_icon">@drawable/exo_icon_circular_play</drawable>
+  <drawable name="media3_notification_play">@android:drawable/ic_media_play</drawable>
+  <drawable name="media3_notification_pause">@android:drawable/ic_media_pause</drawable>
+  <drawable name="media3_notification_seek_to_next">@android:drawable/ic_media_next</drawable>
+  <drawable name="media3_notification_seek_to_previous">@android:drawable/ic_media_previous</drawable>
+  <drawable name="media3_notification_seek_forward">@android:drawable/ic_media_ff</drawable>
+  <drawable name="media3_notification_seek_back">@android:drawable/ic_media_rew</drawable>
+  <drawable name="media3_notification_small_icon">@drawable/media3_icon_circular_play</drawable>
 </resources>
diff --git a/libraries/session/src/main/res/values/strings.xml b/libraries/session/src/main/res/values/strings.xml
index bfe64d4bdc..c3abe673cb 100644
--- a/libraries/session/src/main/res/values/strings.xml
+++ b/libraries/session/src/main/res/values/strings.xml
@@ -20,24 +20,15 @@
     <string name="default_notification_channel_name">Now playing</string>
 
     <!-- Content description of 'play' button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-    <string name="play_button_content_description">Play</string>
+    <string name="media3_controls_play_description">Play</string>
     <!-- Content description of 'pause' button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-    <string name="pause_button_content_description">Pause</string>
-    <!-- Content description of 'skip to previous item' button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-    <string name="skip_to_previous_item_button_content_description">Skip to previous item</string>
-    <!-- Content description of 'skip to next item' button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-    <string name="skip_to_next_item_button_content_description">Skip to next item</string>
-
-    <!-- Description for a media control button that causes the previous track to be played. [CHAR LIMIT=30] -->
-    <string name="exo_controls_previous_description">Previous</string>
-    <!-- Description for a media control button that causes the next track to be played. [CHAR LIMIT=30] -->
-    <string name="exo_controls_next_description">Next</string>
-    <!-- Description for a media control button that causes playback to be paused. [CHAR LIMIT=30] -->
-    <string name="exo_controls_pause_description">Pause</string>
-    <!-- Description for a media control button that causes playback to be started. [CHAR LIMIT=30] -->
-    <string name="exo_controls_play_description">Play</string>
-    <!-- Description for a media control button that causes playback to be rewound. [CHAR LIMIT=30] -->
-    <string name="exo_controls_rewind_description">Rewind</string>
-    <!-- Description for a media control button that causes playback to be fast-forwarded. [CHAR LIMIT=30] -->
-    <string name="exo_controls_fastforward_description">Fast forward</string>
+    <string name="media3_controls_pause_description">Pause</string>
+    <!-- Content description of 'seek to previous item' button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+    <string name="media3_controls_seek_to_previous_description">Seek to previous item</string>
+    <!-- Content description of 'seek to next item' button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+    <string name="media3_controls_seek_to_next_description">Seek to next item</string>
+    <!-- Content description of 'seek back' for rewind button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+    <string name="media3_controls_seek_back_description">Seek back</string>
+    <!-- Content description of 'seek forward' for fast-forward button on media notification for accessibility (not shown on the screen). [CHAR LIMIT=NONE]  -->
+    <string name="media3_controls_seek_forward_description">Seek forward</string>
 </resources>