diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index 002a6403a89..30043c46a05 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -16,50 +16,54 @@
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
          android:layout_width="300sp"
-         android:layout_height="wrap_content">
+         android:layout_height="wrap_content"
+         android:fadeScrollbars="false">
 
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="8dip"
             android:orientation="vertical">
 
         <LinearLayout android:id="@+id/info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                style="@style/wifi_item"
                 android:orientation="vertical" />
 
         <LinearLayout android:id="@+id/type"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                style="@style/wifi_item"
                 android:orientation="vertical"
                 android:visibility="gone">
 
             <TextView
-                    style="?android:attr/textAppearanceSmall"
                     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" />
 
             <TextView
-                    style="?android:attr/textAppearanceSmall"
                     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" />
         </LinearLayout>
@@ -67,36 +71,38 @@
         <LinearLayout android:id="@+id/fields"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                style="@style/wifi_item"
                 android:orientation="vertical"
                 android:visibility="gone">
 
             <TextView
-                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dip"
+                    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" />
 
             <TextView android:id="@+id/hint"
-                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textSize="12sp"
+                    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"
-                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    style="@style/wifi_item_content"
                     android:text="@string/wifi_show_password" />
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index b7b20c7d393..c1fbc4f992e 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -26,20 +26,30 @@
             android:paddingBottom="8dip">
 
         <LinearLayout android:id="@+id/info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 style="@style/wifi_section" />
 
         <LinearLayout android:id="@+id/type"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 style="@style/wifi_section"
                 android:visibility="gone">
 
             <LinearLayout
-                      style="@style/wifi_item" >
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item" >
                 <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_label"
                         android:text="@string/wifi_ssid"
                         android:textDirection="locale" />
 
                 <EditText android:id="@+id/ssid"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_edit_content"
                         android:hint="@string/wifi_ssid_hint"
                         android:maxLength="32"
@@ -47,98 +57,144 @@
                         android:inputType="textNoSuggestions" />
              </LinearLayout>
 
-             <LinearLayout
-                       style="@style/wifi_item" >
-                 <TextView
-                         style="@style/wifi_item_label"
-                         android:text="@string/wifi_security" />
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item" >
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_security" />
 
-                 <Spinner android:id="@+id/security"
-                         style="@style/wifi_item_content"
-                         android:prompt="@string/wifi_security"
-                         android:entries="@array/wifi_security" />
-             </LinearLayout>
+                <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_security" />
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/security_fields"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 style="@style/wifi_section"
                 android:visibility="gone">
 
             <LinearLayout android:id="@+id/eap"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_section"
                     android:visibility="gone">
 
                 <LinearLayout android:id="@+id/l_method"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_eap_method" />
 
                     <Spinner android:id="@+id/method"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_content"
                             android:prompt="@string/wifi_eap_method"
                             android:entries="@array/wifi_eap_method" />
                 </LinearLayout>
                 
                 <LinearLayout android:id="@+id/l_phase2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/please_select_phase2" />
 
                     <Spinner android:id="@+id/phase2"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_content"
                             android:prompt="@string/please_select_phase2"
                             android:entries="@array/wifi_phase2_entries" />
                 </LinearLayout>
 
                 <LinearLayout android:id="@+id/l_ca_cert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_eap_ca_cert" />
 
                     <Spinner android:id="@+id/ca_cert"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_content"
                             android:prompt="@string/wifi_eap_ca_cert" />
                 </LinearLayout>
 
                 <LinearLayout android:id="@+id/l_user_cert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_eap_user_cert" />
 
                     <Spinner android:id="@+id/user_cert"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_content"
                             android:prompt="@string/wifi_eap_user_cert" />
                 </LinearLayout>
 
                 <LinearLayout android:id="@+id/l_identity"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_eap_identity" />
 
                     <EditText android:id="@+id/identity"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:inputType="textNoSuggestions" />
                 </LinearLayout>
 
                 <LinearLayout android:id="@+id/l_anonymous"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         android:visibility="gone"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_eap_anonymous" />
 
                     <EditText android:id="@+id/anonymous"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:inputType="textNoSuggestions" />
@@ -146,34 +202,50 @@
             </LinearLayout>
 
             <LinearLayout android:id="@+id/password_layout"
-                       style="@style/wifi_item" >
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item" >
                 <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_label"
                         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" />
             </LinearLayout>
 
             <LinearLayout android:id="@+id/show_password_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_item" >
                 <!--  Dummy to enable right-justification of checkbox -->
                 <TextView
-                    style="@style/wifi_item_label" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label" />
 
                 <CheckBox android:id="@+id/show_password"
-                    style="@style/wifi_item_content"
-                    android:textSize="14sp"
-                    android:text="@string/wifi_show_password" />
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_content"
+                        android:textSize="14sp"
+                        android:text="@string/wifi_show_password" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/wifi_advanced_toggle"
-                    style="@style/wifi_item"
-                    android:visibility="gone">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/wifi_item"
+                android:visibility="gone">
             <CheckBox android:id="@+id/wifi_advanced_togglebox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_item_content"
                     android:textSize="14sp"
                     android:text="@string/wifi_show_advanced" />
@@ -186,14 +258,20 @@
                     android:visibility="gone">
 
             <LinearLayout android:id="@+id/proxy_settings_fields"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_item"
                     android:visibility="gone">
 
                 <TextView android:id="@+id/proxy_settings_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_label"
                         android:text="@string/proxy_settings_title" />
 
                 <Spinner android:id="@+id/proxy_settings"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_content"
                         android:prompt="@string/proxy_settings_title"
                         android:entries="@array/wifi_proxy_settings" />
@@ -201,26 +279,41 @@
             </LinearLayout>
 
             <LinearLayout android:id="@+id/proxy_warning_limited_support"
-                        style="@style/wifi_item"
-                        android:visibility="gone">
-                    <!--  Dummy to enable right-justification of warning -->
-                    <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item"
+                    android:visibility="gone">
+                <!--  Dummy to enable right-justification of warning -->
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_label" />
 
-                    <TextView
+                <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_content"
                         android:text="@string/proxy_warning_limited_support" />
             </LinearLayout>
 
             <LinearLayout android:id="@+id/proxy_pac_field"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_section"
                     android:visibility="gone">
-                <LinearLayout style="@style/wifi_item">
+                <LinearLayout 
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item">
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/proxy_url_title" />
 
                     <EditText android:id="@+id/proxy_pac"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_content"
                             android:hint="@string/proxy_url_hint"
                             android:inputType="textNoSuggestions"
@@ -228,37 +321,60 @@
                 </LinearLayout>
             </LinearLayout>
             <LinearLayout android:id="@+id/proxy_fields"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_section"
                     android:visibility="gone">
 
-                <LinearLayout style="@style/wifi_item">
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item">
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/proxy_hostname_label" />
 
                     <EditText android:id="@+id/proxy_hostname"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_hostname_hint"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true" />
                 </LinearLayout>
-                <LinearLayout style="@style/wifi_item">
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item">
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/proxy_port_label" />
 
                     <EditText android:id="@+id/proxy_port"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_port_hint"
                             android:inputType="number"
                             android:singleLine="true" />
                 </LinearLayout>
-                <LinearLayout style="@style/wifi_item">
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item">
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/proxy_exclusionlist_label" />
 
                     <EditText android:id="@+id/proxy_exclusionlist"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_exclusionlist_hint"
                             android:inputType="textNoSuggestions"
@@ -267,14 +383,20 @@
             </LinearLayout>
 
             <LinearLayout android:id="@+id/ip_fields"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_item"
                     android:visibility="gone">
 
                 <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_label"
                         android:text="@string/wifi_ip_settings" />
 
                 <Spinner android:id="@+id/ip_settings"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item_content"
                         android:prompt="@string/wifi_ip_settings"
                         android:entries="@array/wifi_ip_settings" />
@@ -282,15 +404,23 @@
             </LinearLayout>
 
             <LinearLayout android:id="@+id/staticip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     style="@style/wifi_section"
                     android:visibility="gone">
                 <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_ip_address" />
 
                     <EditText android:id="@+id/ipaddress"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_ip_address_hint"
@@ -298,12 +428,18 @@
                 </LinearLayout>
 
                 <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_gateway" />
 
                     <EditText android:id="@+id/gateway"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_gateway_hint"
@@ -311,24 +447,36 @@
                 </LinearLayout>
 
                 <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_network_prefix_length" />
 
                     <EditText android:id="@+id/network_prefix_length"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_network_prefix_length_hint"
                             android:inputType="number" />
                 </LinearLayout>
                 <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_dns1" />
 
                     <EditText android:id="@+id/dns1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns1_hint"
@@ -336,12 +484,18 @@
                 </LinearLayout>
 
                 <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
                         style="@style/wifi_item" >
                     <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_label"
                             android:text="@string/wifi_dns2" />
 
                     <EditText android:id="@+id/dns2"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns2_hint"
diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml
index 6cac5595d70..1fe906395e3 100644
--- a/res/layout/wifi_dialog_row.xml
+++ b/res/layout/wifi_dialog_row.xml
@@ -15,15 +15,19 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         style="@style/wifi_item" >
-    <TextView
+    <TextView android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             style="@style/wifi_item_label"
-            android:id="@+id/name"
             android:textAlignment="viewStart" />
 
-    <TextView
-            android:id="@+id/value"
-            style="@style/wifi_item_content"
+    <TextView android:id="@+id/value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/wifi_item_label"
             android:textStyle="bold"
             android:textAlignment="viewStart" />
 </LinearLayout>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 0903167dcdc..8cbd5e8b42d 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -18,4 +18,38 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">16sp</item>
     </style>
+
+    <style name="wifi_item">
+        <item name="android:layout_marginTop">8dip</item>
+        <item name="android:layout_marginStart">8dip</item>
+        <item name="android:layout_marginEnd">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:gravity">start</item>
+    </style>
+
+    <style name="wifi_item_label">
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+    </style>
+
+    <style name="wifi_item_content">
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
+        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+    </style>
+
+    <style name="wifi_item_edit_content">
+        <item name="android:paddingStart">4dip</item>
+        <item name="android:layout_marginStart">4dip</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="wifi_section">
+        <item name="android:orientation">vertical</item>
+    </style>
 </resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 645d1fec307..55fbe047806 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -18,4 +18,38 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">18sp</item>
     </style>
+
+    <style name="wifi_item">
+        <item name="android:layout_marginTop">8dip</item>
+        <item name="android:layout_marginStart">8dip</item>
+        <item name="android:layout_marginEnd">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:gravity">start</item>
+    </style>
+
+    <style name="wifi_item_label">
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+    </style>
+
+    <style name="wifi_item_content">
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
+        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+    </style>
+
+    <style name="wifi_item_edit_content">
+        <item name="android:paddingStart">4dip</item>
+        <item name="android:layout_marginStart">4dip</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="wifi_section">
+        <item name="android:orientation">vertical</item>
+    </style>
 </resources>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 645d1fec307..55fbe047806 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -18,4 +18,38 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">18sp</item>
     </style>
+
+    <style name="wifi_item">
+        <item name="android:layout_marginTop">8dip</item>
+        <item name="android:layout_marginStart">8dip</item>
+        <item name="android:layout_marginEnd">8dip</item>
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:paddingEnd">8dip</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:gravity">start</item>
+    </style>
+
+    <style name="wifi_item_label">
+        <item name="android:paddingStart">8dip</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
+        <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+    </style>
+
+    <style name="wifi_item_content">
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
+        <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+    </style>
+
+    <style name="wifi_item_edit_content">
+        <item name="android:paddingStart">4dip</item>
+        <item name="android:layout_marginStart">4dip</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="wifi_section">
+        <item name="android:orientation">vertical</item>
+    </style>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e38ed392fb7..30f5c7d3d39 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1554,7 +1554,7 @@
      <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
     <string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string>
     <!-- Label for the SSID of the network -->
-    <string name="wifi_ssid">Network SSID</string>
+    <string name="wifi_ssid">Network name</string>
     <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
     <string name="wifi_ssid_hint">Enter the SSID</string>
     <!-- Label for the security of the connection -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b71f36245d4..cd6883f0848 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -220,8 +220,6 @@
     </style>
 
     <style name="wifi_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_marginStart">8dip</item>
         <item name="android:layout_marginEnd">8dip</item>
@@ -232,8 +230,6 @@
     </style>
 
     <style name="wifi_item_label">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingStart">8dip</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textAlignment">viewStart</item>
@@ -242,24 +238,18 @@
     </style>
 
     <style name="wifi_item_content">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
         <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
     </style>
 
     <style name="wifi_item_edit_content">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingStart">4dip</item>
         <item name="android:layout_marginStart">4dip</item>
         <item name="android:textSize">18sp</item>
     </style>
 
     <style name="wifi_section">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
     </style>