diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 0e6d63ab554..5103e8b01d0 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -19,7 +19,7 @@
          android:layout_height="wrap_content">
 
     <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 058afb92cae..2b01d7feaf2 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -21,11 +21,11 @@
     </style>
 
     <style name="wifi_item">
-        <item name="android:layout_width">560dip</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginLeft">32dip</item>
-        <item name="android:layout_marginRight">32dip</item>
+        <item name="android:layout_marginLeft">16dip</item>
+        <item name="android:layout_marginRight">16dip</item>
         <item name="android:orientation">horizontal</item>
         <item name="android:gravity">center_vertical</item>
     </style>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 87239827ef0..42f2837687d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -107,7 +107,7 @@
     </style>
 
     <style name="wifi_item">
-        <item name="android:layout_width">200dip</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
         <item name="android:layout_marginLeft">16dip</item>