diff --git a/app/res/layout/wifi_direct_main.xml b/app/res/layout/wifi_direct_main.xml
index 789223084..e71981d97 100644
--- a/app/res/layout/wifi_direct_main.xml
+++ b/app/res/layout/wifi_direct_main.xml
@@ -98,7 +98,7 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/send"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
@@ -110,7 +110,7 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/discover"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
@@ -122,11 +122,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/submit"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/orange_500"
+                    SquareButtonWithText:backgroundColor="@color/cc_dark_warm_accent_color"
                     SquareButtonWithText:img="@drawable/wifi_direct_submit"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
@@ -134,7 +134,7 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/mode"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 034afaa85..ca74bb6c4 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -109,7 +109,7 @@
     <color name="cc_light_cool_accent_text">#00799A</color>
 
     <!-- Dark Warm Accent -->
-    <color name="cc_dark_warm_accent_color">#FF8400</color>
+    <color name="cc_dark_warm_accent_color">#FEAF31</color>
     <color name="cc_dark_warm_accent_bg">#FFE3C2</color>
     <color name="cc_dark_warm_accent_text">#994f00</color>