diff --git a/libraries/session/src/main/java/androidx/media3/session/CommandButton.java b/libraries/session/src/main/java/androidx/media3/session/CommandButton.java
index 61615e432d..5d09a9daeb 100644
--- a/libraries/session/src/main/java/androidx/media3/session/CommandButton.java
+++ b/libraries/session/src/main/java/androidx/media3/session/CommandButton.java
@@ -97,6 +97,9 @@ public final class CommandButton implements Bundleable {
     ICON_MINUS,
     ICON_PLAYLIST_ADD,
     ICON_PLAYLIST_REMOVE,
+    ICON_QUEUE_ADD,
+    ICON_QUEUE_NEXT,
+    ICON_QUEUE_REMOVE,
     ICON_BLOCK,
     ICON_PLUS_CIRCLE_FILLED,
     ICON_PLUS_CIRCLE_UNFILLED,
@@ -286,6 +289,18 @@ public final class CommandButton implements Bundleable {
    */
   @UnstableApi public static final int ICON_PLAYLIST_REMOVE = 0xeb80;
 
+  /** An icon showing an add to queue symbol (a stylized TV with a plus). */
+  @UnstableApi public static final int ICON_QUEUE_ADD = 0xe05c;
+
+  /**
+   * An icon showing a play next queue item symbol (a stylized TV with a plus and a right-facing
+   * arrow).
+   */
+  @UnstableApi public static final int ICON_QUEUE_NEXT = 0xe066;
+
+  /** An icon showing a remove from queue symbol (a stylized TV with a minus). */
+  @UnstableApi public static final int ICON_QUEUE_REMOVE = 0xe067;
+
   /** An icon showing a block symbol (a circle with a diagonal line). */
   @UnstableApi public static final int ICON_BLOCK = 0xe14b;
 
@@ -653,6 +668,12 @@ public final class CommandButton implements Bundleable {
           return R.drawable.media3_icon_playlist_add;
         case ICON_PLAYLIST_REMOVE:
           return R.drawable.media3_icon_playlist_remove;
+        case ICON_QUEUE_ADD:
+          return R.drawable.media3_icon_queue_add;
+        case ICON_QUEUE_NEXT:
+          return R.drawable.media3_icon_queue_next;
+        case ICON_QUEUE_REMOVE:
+          return R.drawable.media3_icon_queue_remove;
         case ICON_BLOCK:
           return R.drawable.media3_icon_block;
         case ICON_PLUS_CIRCLE_FILLED:
diff --git a/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_add.xml b/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_add.xml
new file mode 100644
index 0000000000..721f79df18
--- /dev/null
+++ b/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_add.xml
@@ -0,0 +1,23 @@
+<!-- Copyright 2024 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="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,600L520,600L520,480L640,480L640,400L520,400L520,280L440,280L440,400L320,400L320,480L440,480L440,600ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,680Q880,713 856.5,736.5Q833,760 800,760L640,760L640,840L320,840ZM160,680L800,680Q800,680 800,680Q800,680 800,680L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680ZM160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L160,680Z"/>
+</vector>
diff --git a/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_next.xml b/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_next.xml
new file mode 100644
index 0000000000..ebb4e93c2e
--- /dev/null
+++ b/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_next.xml
@@ -0,0 +1,23 @@
+<!-- Copyright 2024 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="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M780,900L720,840L840,720L720,600L780,540L960,720L780,900ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,480L800,480L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L680,680L680,760L600,760L600,840L320,840ZM440,600L520,600L520,480L640,480L640,400L520,400L520,280L440,280L440,400L320,400L320,480L440,480L440,600ZM160,680L160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680L160,680L160,680Z"/>
+</vector>
diff --git a/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_remove.xml b/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_remove.xml
new file mode 100644
index 0000000000..b9d84feba3
--- /dev/null
+++ b/libraries/session/src/main/res/drawable-anydpi-v21/media3_icon_queue_remove.xml
@@ -0,0 +1,23 @@
+<!-- Copyright 2024 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="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M320,480L640,480L640,400L320,400L320,480ZM320,840L320,760L160,760Q127,760 103.5,736.5Q80,713 80,680L80,200Q80,167 103.5,143.5Q127,120 160,120L800,120Q833,120 856.5,143.5Q880,167 880,200L880,680Q880,713 856.5,736.5Q833,760 800,760L640,760L640,840L320,840ZM160,680L800,680Q800,680 800,680Q800,680 800,680L800,200Q800,200 800,200Q800,200 800,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680ZM160,680Q160,680 160,680Q160,680 160,680L160,200Q160,200 160,200Q160,200 160,200L160,200Q160,200 160,200Q160,200 160,200L160,680Q160,680 160,680Q160,680 160,680L160,680Z"/>
+</vector>