diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index 5452cd03a26..168f9ae3a2a 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -27,92 +27,112 @@
         <LinearLayout android:id="@+id/info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/wifi_item"
-                android:orientation="vertical" />
+                style="@style/wifi_section" />
 
         <LinearLayout android:id="@+id/type"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/wifi_item"
-                android:orientation="vertical"
+                style="@style/wifi_section"
                 android:visibility="gone">
 
-            <TextView
+            <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:layout_marginTop="8dip"
-                    android:text="@string/wifi_ssid" />
+                    style="@style/wifi_item">
+                <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:layout_marginTop="8dip"
+                        android:text="@string/wifi_ssid" />
 
-            <EditText android:id="@+id/ssid"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_edit_content"
-                    android:singleLine="true"
-                    android:hint="@string/wifi_ssid_hint"
-                    android:inputType="textNoSuggestions"
-                    android:maxLength="32" />
+                <EditText android:id="@+id/ssid"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_edit_content"
+                        android:singleLine="true"
+                        android:hint="@string/wifi_ssid_hint"
+                        android:inputType="textNoSuggestions"
+                        android:maxLength="32" />
+            </LinearLayout>
 
-            <TextView
+            <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:layout_marginTop="8dip"
-                    android:text="@string/wifi_security" />
+                    style="@style/wifi_item">
+                <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:layout_marginTop="8dip"
+                        android:text="@string/wifi_security" />
 
-            <Spinner android:id="@+id/security"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_content"
-                    android:prompt="@string/wifi_security"
-                    android:entries="@array/wifi_ap_security" />
+                <Spinner android:id="@+id/security"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_content"
+                        android:prompt="@string/wifi_security"
+                        android:entries="@array/wifi_ap_security" />
+            </LinearLayout>
 
         </LinearLayout>
 
         <LinearLayout android:id="@+id/fields"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/wifi_item"
-                android:orientation="vertical"
+                style="@style/wifi_section"
                 android:visibility="gone">
 
-            <TextView
+            <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:layout_marginTop="8dip"
-                    android:text="@string/wifi_password" />
+                    style="@style/wifi_item">
+                <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:layout_marginTop="8dip"
+                        android:text="@string/wifi_password" />
 
-            <EditText android:id="@+id/password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_edit_content"
-                    android:singleLine="true"
-                    android:password="true"
-                    android:maxLength="63"
-                    android:imeOptions="flagForceAscii" />
+                <EditText android:id="@+id/password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_edit_content"
+                        android:singleLine="true"
+                        android:password="true"
+                        android:maxLength="63"
+                        android:imeOptions="flagForceAscii" />
+            </LinearLayout>
 
-            <TextView android:id="@+id/hint"
+            <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:text="@string/credentials_password_too_short"
-                    android:layout_marginTop="8dip"
-                    android:layout_marginBottom="10sp"/>
+                    style="@style/wifi_item">
+                <TextView android:id="@+id/hint"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:text="@string/credentials_password_too_short"
+                        android:layout_marginTop="8dip"
+                        android:layout_marginBottom="10sp"/>
 
-            <CheckBox android:id="@+id/show_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_content"
-                    android:text="@string/wifi_show_password" />
+                <CheckBox android:id="@+id/show_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_content"
+                        android:text="@string/wifi_show_password" />
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/fields"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/wifi_item"
-                android:orientation="vertical">
+                style="@style/wifi_section" >
 
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item">
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -125,6 +145,7 @@
                     android:layout_height="wrap_content"
                     style="@style/wifi_item_content"
                     android:prompt="@string/wifi_ap_band_config" />
+            </LinearLayout>
         </LinearLayout>
 
     </LinearLayout>