15 files changed, 37 insertions, 14 deletions
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
new file mode 100644
index 00000000..444e8a5e
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add.png
diff --git a/res/drawable-hdpi/ic_menu_login.png b/res/drawable-hdpi/ic_menu_login.png
new file mode 100644
index 00000000..afa152b2
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_login.png
diff --git a/res/drawable-hdpi/ic_menu_settings_holo_light.png b/res/drawable-hdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 00000000..577e0558
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_settings_holo_light.png
diff --git a/res/drawable-ldpi/ic_menu_add.png b/res/drawable-ldpi/ic_menu_add.png
new file mode 100644
index 00000000..89620af8
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_add.png
diff --git a/res/drawable-ldpi/ic_menu_login.png b/res/drawable-ldpi/ic_menu_login.png
new file mode 100644
index 00000000..d4181de5
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_login.png
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
new file mode 100755
index 00000000..361c7c46
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add.png
diff --git a/res/drawable-mdpi/ic_menu_login.png b/res/drawable-mdpi/ic_menu_login.png
new file mode 100644
index 00000000..122ba33b
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_login.png
diff --git a/res/drawable-mdpi/ic_menu_settings_holo_light.png b/res/drawable-mdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 00000000..f32a37e4
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_settings_holo_light.png
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
new file mode 100644
index 00000000..7d498a96
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add.png
diff --git a/res/drawable-xhdpi/ic_menu_login.png b/res/drawable-xhdpi/ic_menu_login.png
new file mode 100644
index 00000000..5095ed97
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_login.png
diff --git a/res/drawable-xhdpi/ic_menu_settings_holo_light.png b/res/drawable-xhdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 00000000..aa33c388
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_settings_holo_light.png
diff --git a/res/layout/provider_list_fragment.xml b/res/layout/provider_list_fragment.xml
index 0db0734b..5a6770c8 100644
--- a/res/layout/provider_list_fragment.xml
+++ b/res/layout/provider_list_fragment.xml
@@ -8,15 +8,8 @@
     <ListView
         android:id="@id/android:list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dip"
         android:layout_weight="1"
-	android:layout_alignParentTop="true"
         android:drawSelectorOnTop="false" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:onClick="addAndSelectNewProvider"
-        android:text="@string/new_provider_button" />
-
 </LinearLayout>
diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index 55ad91b4..2ce8b87c 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -3,12 +3,33 @@
     <item
         android:id="@+id/menu_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_settings_holo_light"
         android:title="@string/menu_settings"/>
-    <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
-    <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
-    <item android:id="@+id/switch_provider" android:title="@string/switch_provider_menu_option" android:orderInCategory="501"/>
-    <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="false"></item>
-    <item android:id="@+id/logout_button" android:title="@string/logout_button" android:visible="false"></item>
+    <item
+        android:id="@+id/about_leap"
+        android:orderInCategory="110"
+        android:title="@string/about"/>
+    <item
+        android:id="@+id/legacy_interface"
+        android:orderInCategory="500"
+        android:title="ICS OpenVPN Interface"/>
+    <item
+        android:id="@+id/switch_provider"
+        android:orderInCategory="501"
+        android:title="@string/switch_provider_menu_option"/>
+    <item
+        android:id="@+id/login_button"
+        android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_login"
+        android:title="@string/login_button"
+        android:visible="false">
+    </item>
+    <item
+        android:id="@+id/logout_button"
+        android:showAsAction="ifRoom"
+        android:title="@string/logout_button"
+        android:visible="false">
+    </item>
 
 </menu>
 \ No newline at end of file
diff --git a/res/menu/configuration_wizard_activity.xml b/res/menu/configuration_wizard_activity.xml
index 9e441a18..9936b6dc 100644
--- a/res/menu/configuration_wizard_activity.xml
+++ b/res/menu/configuration_wizard_activity.xml
@@ -5,4 +5,11 @@
         android:orderInCategory="110"
         android:title="@string/about"/>
 
+    <item
+        android:id="@+id/new_provider"
+        android:orderInCategory="210"
+        android:title="@string/new_provider_button"
+        android:showAsAction="ifRoom|withText"
+        android:icon="@drawable/ic_menu_add"
+        />
 </menu>
 \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2fdfc154..91e72a60 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="cant_read_folder">Unable to read directory</string>
     <string name="select">Select</string>
     <string name="cancel">Cancel</string>
+    <string name="ok">OK</string>
     <string name="no_data">No Data</string>
     <string name="useLZO">LZO Compression</string>
     <string name="client_no_certificate">No Certificate</string>
@@ -278,6 +279,7 @@
     <string name="username_ask">Please enter your username</string>
     <string name="password_hint">password</string>
     <string name="user_message">User message</string>
+    <string name="error_srp_math_error_user_message">Try again: server math error.</string>
     <string name="error_bad_user_password_user_message">Not valid username and/or password.</string>
     <string name="error_not_valid_password_user_message">It should have at least 8 characters.</string>
     <string name="error_client_http_user_message">Try again: Client HTTP error</string>