diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java
index 0b637f8..e37b147 100644
--- a/java/com/android/incallui/NewReturnToCallController.java
+++ b/java/com/android/incallui/NewReturnToCallController.java
@@ -275,6 +275,10 @@
     actions.add(
         Action.builder()
             .setIconDrawable(context.getDrawable(speakerButtonInfo.icon))
+            .setSecondaryIconDrawable(
+                speakerButtonInfo.checkable
+                    ? null
+                    : context.getDrawable(R.drawable.quantum_ic_arrow_drop_down_vd_theme_24))
             .setName(context.getText(speakerButtonInfo.label))
             .setCheckable(speakerButtonInfo.checkable)
             .setChecked(speakerButtonInfo.isChecked)
diff --git a/java/com/android/newbubble/NewBubbleInfo.java b/java/com/android/newbubble/NewBubbleInfo.java
index cc7ac7c..d9232a5 100644
--- a/java/com/android/newbubble/NewBubbleInfo.java
+++ b/java/com/android/newbubble/NewBubbleInfo.java
@@ -80,6 +80,9 @@
 
     public abstract Drawable getIconDrawable();
 
+    @Nullable
+    public abstract Drawable getSecondaryIconDrawable();
+
     @NonNull
     public abstract CharSequence getName();
 
@@ -100,7 +103,8 @@
           .setChecked(action.isChecked())
           .setCheckable(action.isCheckable())
           .setName(action.getName())
-          .setIconDrawable(action.getIconDrawable());
+          .setIconDrawable(action.getIconDrawable())
+          .setSecondaryIconDrawable(action.getSecondaryIconDrawable());
     }
 
     /** Builder for {@link Action} */
@@ -109,6 +113,8 @@
 
       public abstract Builder setIconDrawable(Drawable iconDrawable);
 
+      public abstract Builder setSecondaryIconDrawable(@Nullable Drawable secondaryIconDrawable);
+
       public abstract Builder setName(@NonNull CharSequence name);
 
       public abstract Builder setIntent(@NonNull PendingIntent intent);
