diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
index 214949c..7203c4f 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
@@ -15,9 +15,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.cardview.widget.CardView
+import androidx.constraintlayout.helper.widget.Flow
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintProperties.WRAP_CONTENT
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.view.allViews
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@@ -79,11 +83,8 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
         private val attachmentBoxView: View = itemView.findViewById(R.id.detail_item_attachment_file_box)
         private val attachmentIconView: ImageView = itemView.findViewById(R.id.detail_item_attachment_file_icon)
         private val attachmentInfoView: TextView = itemView.findViewById(R.id.detail_item_attachment_file_info)
-        private val actionsWrapperView: View = itemView.findViewById(R.id.detail_item_actions_wrapper)
-        private val action1Button: MaterialButton = itemView.findViewById(R.id.detail_item_action_1)
-        private val action2Button: MaterialButton = itemView.findViewById(R.id.detail_item_action_2)
-        private val action3Button: MaterialButton = itemView.findViewById(R.id.detail_item_action_3)
-        private val actionButtons: List<MaterialButton> = listOf(action1Button, action2Button, action3Button)
+        private val actionsWrapperView: ConstraintLayout = itemView.findViewById(R.id.detail_item_actions_wrapper)
+        private val actionsFlow: Flow = itemView.findViewById(R.id.detail_item_actions_flow)
 
         fun bind(notification: Notification) {
             this.notification = notification
@@ -125,6 +126,7 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
             val attachment = notification.attachment
             val exists = if (attachment?.contentUri != null) fileExists(context, attachment.contentUri) else false
             renderPriority(context, notification)
+            resetCardButtons()
             maybeRenderMenu(context, notification, exists)
             maybeRenderAttachment(context, notification, exists)
             maybeRenderActions(context, notification)
@@ -182,20 +184,36 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
                 val actionsCount = min(notification.actions.size, 3) // per documentation, only 3 actions are available
                 for (i in 0 until actionsCount) {
                     val action = notification.actions[i]
-                    val actionButton = actionButtons[i]
-                    actionButton.visibility = View.VISIBLE
-                    actionButton.text = formatActionLabel(action)
-                    actionButton.setOnClickListener { runAction(context, notification, action) }
-                }
-                for (i in actionsCount until 3) {
-                    val actionButton = actionButtons[i]
-                    actionButton.visibility = View.GONE
+                    val label = formatActionLabel(action)
+                    val actionButton = createCardButton(context, label) { runAction(context, notification, action) }
+                    addButtonToCard(actionButton)
                 }
             } else {
                 actionsWrapperView.visibility = View.GONE
             }
         }
 
+        private fun resetCardButtons() {
+            // clear any previously created dynamic buttons
+            actionsFlow.allViews.forEach { it -> actionsFlow.removeView(it) }
+            actionsWrapperView.removeAllViews()
+            actionsWrapperView.addView(actionsFlow)
+        }
+
+        private fun addButtonToCard(button: MaterialButton) {
+            actionsWrapperView.addView(button)
+            actionsFlow.addView(button)
+        }
+
+        private fun createCardButton(context: Context, label: String, onClick: () -> Boolean): MaterialButton {
+            val button = MaterialButton(context, null, R.attr.borderlessButtonStyle)
+            button.id = View.generateViewId()
+            button.layoutParams = ConstraintLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT)
+            button.text = label
+            button.setOnClickListener { onClick() }
+            return button
+        }
+
         private fun maybeRenderAttachmentBox(context: Context, notification: Notification, attachment: Attachment, exists: Boolean, image: Boolean) {
             if (image) {
                 attachmentBoxView.visibility = View.GONE
diff --git a/app/src/main/res/layout/fragment_detail_item.xml b/app/src/main/res/layout/fragment_detail_item.xml
index 8705e0f..33a34bc 100644
--- a/app/src/main/res/layout/fragment_detail_item.xml
+++ b/app/src/main/res/layout/fragment_detail_item.xml
@@ -155,7 +155,6 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:constraint_referenced_ids="detail_item_action_1,detail_item_action_2,detail_item_action_3"
                 app:layout_constraintTop_toTopOf="parent"
                 app:flow_wrapMode="chain"
                 app:flow_horizontalStyle="packed"
@@ -164,27 +163,6 @@
                 app:flow_horizontalBias="0"
                 app:flow_verticalGap="0dp" app:flow_horizontalGap="0dp"/>
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/detail_item_action_1"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="View" android:visibility="gone"/>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/detail_item_action_2"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Broadcast" android:visibility="gone"/>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/detail_item_action_3"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="HTTP" android:visibility="gone"/>
-
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>