diff --git a/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt
index 348426eab..b8701f9d5 100644
--- a/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt
+++ b/iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt
@@ -94,23 +94,11 @@ class IterableEmbeddedView(
         val titleText = view.findViewById<TextView>(R.id.embedded_message_title)
         val bodyText = view.findViewById<TextView>(R.id.embedded_message_body)
 
-        if(config?.primaryBtnBackgroundColor != null) {
-            val primaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION)
-                ContextCompat.getDrawable(requireContext(), R.drawable.primary_notification_button_background) as? GradientDrawable
-                else ContextCompat.getDrawable(requireContext(), R.drawable.primary_banner_button_background) as? GradientDrawable
-            primaryBtnBackgroundDrawable?.setColor(primaryBtnBackgroundColor)
-
-            firstButton.background = primaryBtnBackgroundDrawable
-        }
-
-        if(config?.secondaryBtnBackgroundColor != null) {
-            val secondaryBtnBackgroundDrawable = if(viewType == IterableEmbeddedViewType.NOTIFICATION)
-                ContextCompat.getDrawable(requireContext(), R.drawable.secondary_notification_button_background) as? GradientDrawable
-                else ContextCompat.getDrawable(requireContext(), R.drawable.secondary_banner_button_background) as? GradientDrawable
-            secondaryBtnBackgroundDrawable?.setColor(secondaryBtnBackgroundColor)
+        firstButton.setBackgroundColor(primaryBtnBackgroundColor)
+        firstButton.setTextColor(primaryBtnTextColor)
 
-            secondButton.background = secondaryBtnBackgroundDrawable
-        }
+        secondButton.setBackgroundColor(secondaryBtnBackgroundColor)
+        secondButton.setTextColor(secondaryBtnTextColor)
 
         firstButton.setTextColor(primaryBtnTextColor)
         secondButton.setTextColor(secondaryBtnTextColor)
diff --git a/iterableapi-ui/src/main/res/drawable/primary_banner_button_background.xml b/iterableapi-ui/src/main/res/drawable/primary_banner_button_background.xml
deleted file mode 100644
index 7d44a8e49..000000000
--- a/iterableapi-ui/src/main/res/drawable/primary_banner_button_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/banner_button_color" />
-
-    <corners
-        android:radius="32dp" />
-</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/primary_card_button_background.xml b/iterableapi-ui/src/main/res/drawable/primary_card_button_background.xml
deleted file mode 100644
index eb087387a..000000000
--- a/iterableapi-ui/src/main/res/drawable/primary_card_button_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/white" />
-
-    <corners
-        android:radius="32dp" />
-</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/primary_notification_button_background.xml b/iterableapi-ui/src/main/res/drawable/primary_notification_button_background.xml
deleted file mode 100644
index 498fc89d9..000000000
--- a/iterableapi-ui/src/main/res/drawable/primary_notification_button_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/notification_button_border_color" />
-
-    <corners
-        android:radius="32dp" />
-</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/secondary_banner_button_background.xml b/iterableapi-ui/src/main/res/drawable/secondary_banner_button_background.xml
deleted file mode 100644
index eb087387a..000000000
--- a/iterableapi-ui/src/main/res/drawable/secondary_banner_button_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/white" />
-
-    <corners
-        android:radius="32dp" />
-</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/secondary_card_button_background.xml b/iterableapi-ui/src/main/res/drawable/secondary_card_button_background.xml
deleted file mode 100644
index eb087387a..000000000
--- a/iterableapi-ui/src/main/res/drawable/secondary_card_button_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/white" />
-
-    <corners
-        android:radius="32dp" />
-</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/drawable/secondary_notification_button_background.xml b/iterableapi-ui/src/main/res/drawable/secondary_notification_button_background.xml
deleted file mode 100644
index a42cf0e83..000000000
--- a/iterableapi-ui/src/main/res/drawable/secondary_notification_button_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/notification_background_color" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/notification_background_color" />
-
-    <corners
-        android:radius="32dp" />
-</shape>
\ No newline at end of file
diff --git a/iterableapi-ui/src/main/res/layout-v21/banner_view.xml b/iterableapi-ui/src/main/res/layout-v21/banner_view.xml
index 9f5fff581..39c2623a4 100644
--- a/iterableapi-ui/src/main/res/layout-v21/banner_view.xml
+++ b/iterableapi-ui/src/main/res/layout-v21/banner_view.xml
@@ -69,43 +69,37 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_first_button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:background="@drawable/primary_banner_button_background"
-            android:ellipsize="end"
+            android:layout_height="48dp"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="8dp"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textSize="14sp"
-            android:textColor="@color/white"
-            app:cornerRadius="32dp" />
+            app:cornerRadius="18dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_second_button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:background="@drawable/secondary_banner_button_background"
+            android:layout_height="48dp"
+            android:layout_marginEnd="16dp"
             android:ellipsize="end"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textSize="14sp"
-            android:textColor="@color/white"
-            app:cornerRadius="32dp" />
+            app:cornerRadius="18dp" />
 
     </LinearLayout>
 
diff --git a/iterableapi-ui/src/main/res/layout-v21/card_view.xml b/iterableapi-ui/src/main/res/layout-v21/card_view.xml
index ad8ddcf28..d481ffe23 100644
--- a/iterableapi-ui/src/main/res/layout-v21/card_view.xml
+++ b/iterableapi-ui/src/main/res/layout-v21/card_view.xml
@@ -81,42 +81,38 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_first_button"
+            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:background="@drawable/primary_card_button_background"
-            android:ellipsize="end"
+            android:layout_height="48dp"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="8dp"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textSize="14sp"
-            android:textColor="@color/white"
             app:cornerRadius="32dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_second_button"
+            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:background="@drawable/secondary_card_button_background"
+            android:layout_height="48dp"
+            android:layout_marginEnd="16dp"
             android:ellipsize="end"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
+            android:text=""
             android:textAllCaps="false"
-            android:textSize="14sp"
-            android:textColor="@color/white"
             app:cornerRadius="32dp" />
 
     </LinearLayout>
diff --git a/iterableapi-ui/src/main/res/layout-v21/notification_view.xml b/iterableapi-ui/src/main/res/layout-v21/notification_view.xml
index 659d3790c..b2b3164c8 100644
--- a/iterableapi-ui/src/main/res/layout-v21/notification_view.xml
+++ b/iterableapi-ui/src/main/res/layout-v21/notification_view.xml
@@ -58,34 +58,34 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_first_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="48dp"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="8dp"
-            android:textColor="@color/notification_text_color"
-            android:background="@drawable/primary_notification_button_background"
             android:ellipsize="end"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textSize="14sp"
-            app:cornerRadius="32dp" />
+            app:cornerRadius="32dp"
+            app:strokeColor="@color/notification_button_border_color"
+            app:strokeWidth="1dp"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_second_button"
+            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:textColor="@color/notification_text_color"
-            android:background="@drawable/secondary_notification_button_background"
+            android:layout_height="48dp"
+            android:layout_marginEnd="16dp"
             android:ellipsize="end"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
diff --git a/iterableapi-ui/src/main/res/layout/banner_view.xml b/iterableapi-ui/src/main/res/layout/banner_view.xml
index 2988c4f28..e53e9a884 100644
--- a/iterableapi-ui/src/main/res/layout/banner_view.xml
+++ b/iterableapi-ui/src/main/res/layout/banner_view.xml
@@ -69,43 +69,37 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_first_button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:background="@drawable/primary_banner_button_background"
-            android:ellipsize="end"
+            android:layout_height="48dp"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textSize="14sp"
-            android:textColor="@color/white"
-            app:cornerRadius="32dp" />
+            app:cornerRadius="18dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_second_button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="48dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:background="@drawable/secondary_banner_button_background"
             android:ellipsize="end"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textSize="14sp"
-            android:textColor="@color/white"
-            app:cornerRadius="32dp" />
+            app:cornerRadius="18dp" />
 
     </LinearLayout>
 
diff --git a/iterableapi-ui/src/main/res/layout/card_view.xml b/iterableapi-ui/src/main/res/layout/card_view.xml
index 479dfcbc2..db5d3957b 100644
--- a/iterableapi-ui/src/main/res/layout/card_view.xml
+++ b/iterableapi-ui/src/main/res/layout/card_view.xml
@@ -81,43 +81,38 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_first_button"
+            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="48dp"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="8dp"
-            android:background="@drawable/primary_card_button_background"
             android:ellipsize="end"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
-            android:textColor="@color/white"
-            app:cornerRadius="32dp"
-            tools:ignore="Suspicious0dp"/>
+            android:textSize="14sp"
+            app:cornerRadius="32dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_second_button"
-            android:layout_width="0dp"
-            android:layout_height="36dp"
+            style="@style/Widget.MaterialComponents.Button"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
-            android:layout_weight="1"
-            android:background="@drawable/secondary_card_button_background"
             android:ellipsize="end"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
+            android:text=""
             android:textAllCaps="false"
-            android:textColor="@color/white"
             app:cornerRadius="32dp" />
 
     </LinearLayout>
diff --git a/iterableapi-ui/src/main/res/layout/notification_view.xml b/iterableapi-ui/src/main/res/layout/notification_view.xml
index 081512931..050370a7e 100644
--- a/iterableapi-ui/src/main/res/layout/notification_view.xml
+++ b/iterableapi-ui/src/main/res/layout/notification_view.xml
@@ -62,36 +62,34 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_first_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="48dp"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:textColor="@color/notification_text_color"
-            android:background="@drawable/primary_notification_button_background"
             android:ellipsize="end"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
             android:stateListAnimator="@null"
             android:textAllCaps="false"
             android:textSize="14sp"
-            app:cornerRadius="32dp" />
+            app:cornerRadius="32dp"
+            app:strokeColor="@color/notification_button_border_color"
+            app:strokeWidth="1dp"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/embedded_message_second_button"
+            style="@style/Widget.MaterialComponents.Button"
             android:layout_width="wrap_content"
-            android:layout_height="36dp"
+            android:layout_height="48dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:textColor="@color/notification_text_color"
-            android:background="@drawable/secondary_notification_button_background"
             android:ellipsize="end"
-            android:paddingTop="0dp"
-            android:paddingBottom="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:singleLine="true"