diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index a1344600e7e..d458cd3918e 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -84,7 +84,7 @@
                     android:maxLength="63" />
 
             <TextView android:id="@+id/hint"
-                    style="?android:attr/textAppearanceSmallInverse"
+                    style="?android:attr/textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textSize="12sp"
diff --git a/res/layout/wifi_config_preference.xml b/res/layout/wifi_config_preference.xml
index 913222f68c6..f19a9ec867e 100644
--- a/res/layout/wifi_config_preference.xml
+++ b/res/layout/wifi_config_preference.xml
@@ -223,6 +223,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:visibility="gone">
+
             <TextView android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/proxy_hostname_label" />
@@ -231,7 +232,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
+                    android:hint="@string/proxy_hostname_hint" />
 
             <TextView android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -241,7 +242,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
+                    android:hint="@string/proxy_port_hint" />
 
             <TextView android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -251,7 +252,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
-                    android:inputType="textNoSuggestions" />
+                    android:hint="@string/proxy_exclusionlist_hint" />
 
         </LinearLayout>
 
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index a530a848d24..7d199bdd362 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -218,6 +218,7 @@
         <LinearLayout android:id="@+id/proxy_fields"
                 style="@style/wifi_section"
                 android:visibility="gone">
+
             <LinearLayout style="@style/wifi_item">
                 <TextView
                         style="@style/wifi_item_label"
@@ -225,8 +226,8 @@
 
                 <EditText android:id="@+id/proxy_hostname"
                         style="@style/wifi_item_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
+                        android:hint="@string/proxy_hostname_hint"
+                        android:singleLine="true" />
             </LinearLayout>
             <LinearLayout style="@style/wifi_item">
                 <TextView
@@ -235,8 +236,8 @@
 
                 <EditText android:id="@+id/proxy_port"
                         style="@style/wifi_item_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
+                        android:hint="@string/proxy_port_hint"
+                        android:singleLine="true" />
             </LinearLayout>
             <LinearLayout style="@style/wifi_item">
                 <TextView
@@ -245,8 +246,8 @@
 
                 <EditText android:id="@+id/proxy_exclusionlist"
                         style="@style/wifi_item_content"
-                        android:singleLine="true"
-                        android:inputType="textNoSuggestions" />
+                        android:hint="@string/proxy_exclusionlist_hint"
+                        android:singleLine="true" />
             </LinearLayout>
         </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ff04cf73f28..fdf499aecd9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -313,14 +313,20 @@
     <string name="proxy_clear_text">Clear</string>
     <!-- HTTP proxy settings. The port number label. -->
     <string name="proxy_port_label">Proxy port</string>
+    <!-- HTTP proxy settings. The hint text field for port. [CHAR LIMIT=50]-->
+    <string name="proxy_port_hint">8080</string>
     <!-- HTTP proxy settings. The exclusion list label. -->
-    <string name="proxy_exclusionlist_label">No Proxy for</string>
+    <string name="proxy_exclusionlist_label">Bypass proxy for</string>
+    <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+    <string name="proxy_exclusionlist_hint">example.com,mycomp.test.com,localhost</string>
     <!-- HTTP proxy settings. The button to restore the defaults. -->
     <string name="proxy_defaultView_text">Restore defaults</string>
     <!-- HTTP proxy settings. The button to save. -->
     <string name="proxy_action_text">Done</string>
     <!-- HTTP proxy settings. The text field for the hostname -->
     <string name="proxy_hostname_label">Proxy hostname</string>
+    <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+    <string name="proxy_hostname_hint">proxy.example.com</string>
     <!-- HTTP proxy settings. Title if there is an error-->
     <string name="proxy_error">Attention</string>
     <!-- HTTP proxy settings. Button to get rid of error box-->