diff --git a/res/layout/support_escalation_options.xml b/res/layout/support_escalation_options.xml
index 17e03ff0344..ae208f19b57 100644
--- a/res/layout/support_escalation_options.xml
+++ b/res/layout/support_escalation_options.xml
@@ -65,7 +65,7 @@
             android:orientation="vertical">
             <Button
                 android:id="@android:id/text1"
-                style="@style/SupportPrimaryButton"
+                style="@style/ActionPrimaryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"/>
@@ -86,7 +86,7 @@
             android:orientation="vertical">
             <Button
                 android:id="@android:id/text2"
-                style="@style/SupportPrimaryButton"
+                style="@style/ActionPrimaryButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"/>
diff --git a/res/layout/support_offline_escalation_options.xml b/res/layout/support_offline_escalation_options.xml
index 18d8f98747e..09863d3aab2 100644
--- a/res/layout/support_offline_escalation_options.xml
+++ b/res/layout/support_offline_escalation_options.xml
@@ -56,7 +56,7 @@
     </LinearLayout>
     <Button
         android:id="@android:id/text1"
-        style="@style/SupportPrimaryButton"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
diff --git a/res/layout/support_sign_in_button.xml b/res/layout/support_sign_in_button.xml
index 45de57184ce..5bea068a2c9 100644
--- a/res/layout/support_sign_in_button.xml
+++ b/res/layout/support_sign_in_button.xml
@@ -38,7 +38,7 @@
         android:textColor="?android:attr/textColorSecondary"/>
     <Button
         android:id="@android:id/text1"
-        style="@style/SupportPrimaryButton"
+        style="@style/ActionPrimaryButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"/>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7c43e990394..c68eb729c6d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -338,8 +338,6 @@
 
     <style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/>
 
-    <style name="SupportPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
-
     <style name="SupportSecondaryButton"
            parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
         <item name="android:textSize">12sp</item>
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
index b91df657ce0..74bdd9b1d79 100644
--- a/tests/robotests/res/values/themes.xml
+++ b/tests/robotests/res/values/themes.xml
@@ -1,3 +1,7 @@
 <resources>
-    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings"/>
+    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings" />
+
+    <!-- Override the main app's style for ActionPrimaryButton to get around lack of new style
+         support in robolectric  -->
+    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button" />
 </resources>