diff --git a/res/layout/wifi_network_details_two_buttons_panel.xml b/res/layout/wifi_network_details_two_buttons_panel.xml
index 6abfac31dd6..f076eeaf032 100644
--- a/res/layout/wifi_network_details_two_buttons_panel.xml
+++ b/res/layout/wifi_network_details_two_buttons_panel.xml
@@ -23,28 +23,23 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="bottom"
-        android:paddingTop="4dip"
-        android:orientation="horizontal">
+        android:paddingTop="4dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp">
         <Button
+            style="@android:style/@Widget.Material.Button.Colored"
             android:id="@+id/forget_button"
-            android:layout_width="120dip"
-            android:layout_weight="0.4"
+            android:text="@string/forget"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"/>
-        <!-- Spacer -->
-        <View
-            android:id="@+id/buttons_spacer_left"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:visibility="invisible"
-            android:layout_weight="0.2" />
+            android:layout_gravity="center"/>
         <Button
             style="@android:style/Widget.Material.Button.Colored"
             android:id="@+id/signin_button"
-            android:layout_width="120dip"
-            android:text="@string/cancel"
-            android:layout_weight="0.4"
+            android:text="@string/support_sign_in_button_text"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center"/>
 </LinearLayout>
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index d8db2d0132d..d624a7fe717 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -245,7 +245,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
 
         mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
         mSignInButton = mButtonsPref.findViewById(R.id.signin_button);
-        mSignInButton.setText(R.string.support_sign_in_button_text);
         mSignInButton.setOnClickListener(view -> signIntoNetwork());
 
         mSignalStrengthPref =
@@ -265,7 +264,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
 
         mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
         mForgetButton = mButtonsPref.findViewById(R.id.forget_button);
-        mForgetButton.setText(R.string.forget);
         mForgetButton.setOnClickListener(view -> forgetNetwork());
     }