diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt b/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt
index eb7ccdc0..437b0695 100644
--- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt
@@ -20,6 +20,10 @@ import androidx.compose.material3.Shapes
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -27,7 +31,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.looker.droidify.R
 import com.looker.droidify.entity.ActionState
-import com.looker.droidify.entity.ComponentState
 import com.looker.droidify.entity.DownloadState
 import com.looker.droidify.ui.compose.components.MainActionButton
 import com.looker.droidify.ui.compose.components.SecondaryActionButton
@@ -41,12 +44,14 @@ fun AppInfoHeader(
     appSize: String,
     appDev: String,
     mainAction: ActionState?,
-    secondaryAction: ComponentState? = null,
+    secondaryAction: ActionState? = null,
+    possibleActions: Set<ActionState>,
     onSource: () -> Unit = { },
     onSourceLong: () -> Unit = { },
-    onAction: () -> Unit = { },
-    onSecondaryAction: () -> Unit = { }
+    onAction: (ActionState?) -> Unit = { }
 ) {
+    var isExpanded by remember { mutableStateOf(false) }
+
     Surface(
         modifier = modifier.fillMaxWidth(),
         shape = MaterialTheme.shapes.large
@@ -67,17 +72,34 @@ fun AppInfoHeader(
             Row(
                 horizontalArrangement = Arrangement.spacedBy(8.dp)
             ) {
-                SecondaryActionButton(packageState = secondaryAction, onClick = {
-                    onSecondaryAction()
-                })
+                if (possibleActions.size == 1) {
+                    SecondaryActionButton(packageState = secondaryAction, onClick = {
+                        onAction(secondaryAction)
+                    })
+                } else if (possibleActions.size > 1) {
+                    SecondaryActionButton(
+                        packageState = if (isExpanded) ActionState.Retract else ActionState.Expand,
+                        onClick = {
+                            isExpanded = !isExpanded
+                        })
+                }
                 MainActionButton(
                     modifier = Modifier.weight(1f),
                     actionState = mainAction ?: ActionState.NoAction,
                     onClick = {
-                        onAction()
+                        onAction(mainAction)
                     }
                 )
             }
+            AnimatedVisibility(visible = isExpanded) {
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                    possibleActions.forEach {
+                        SecondaryActionButton(packageState = it) {
+                            onAction(it)
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt
index 4884390d..e72e122f 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt
@@ -488,6 +488,8 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks {
                             appDev = product.author.name.replaceFirstChar { it.titlecase() },
                             mainAction = mainAction,
                             secondaryAction = secondaryAction,
+                            possibleActions = actions?.filter { it != mainAction }?.toSet()
+                                ?: emptySet(),
                             onSource = {
                                 product.source.let { link ->
                                     if (link.isNotEmpty()) {
@@ -507,8 +509,7 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks {
                                     }
                                 }
                             },
-                            onAction = { onActionClick(mainAction) },
-                            onSecondaryAction = { onActionClick(secondaryAction) }
+                            onAction = { onActionClick(it) }
                         )
                     }
                     item {