diff --git a/WiFiConnect/res/values/menu_strings.xml b/WiFiConnect/res/values/menu_strings.xml
index 36fdc92..8456939 100644
--- a/WiFiConnect/res/values/menu_strings.xml
+++ b/WiFiConnect/res/values/menu_strings.xml
@@ -3,6 +3,6 @@
 <string name="menu_settings">Settings</string>
 <string name="menu_quit">Quit</string>
 <string name="menu_about">About</string>
-<string name="menu_wifi_settings">Wifi Settings</string>
+<string name="menu_wifi_settings">WiFi Configuration</string>
 <string name="menu_share">Share</string>
 </resources>
diff --git a/WiFiConnect/res/values/strings.xml b/WiFiConnect/res/values/strings.xml
index 6fc4541..532acf9 100644
--- a/WiFiConnect/res/values/strings.xml
+++ b/WiFiConnect/res/values/strings.xml
@@ -52,7 +52,7 @@
 <string name="pref_settings_vibrate_key">notificationVibrate</string>
 
 
-<string name="notif_service_still_running_summary">Connected to a familiar Wifi</string>
+<string name="notif_service_still_running_summary">Connected to a familiar WiFi</string>
 <string name="shared_settings_file_name">WifiConnectSharedSettings</string>
 
 <string name="app_about_summary">
@@ -68,34 +68,34 @@
 <string name="password">Password</string>
 <string name="enter_password">Enter your password</string>
 <string name="connect">Connect</string>
-<string name="wifi_ssid">Wifi name</string>
-<string name="select_wifi">Select your wifi</string>
+<string name="wifi_ssid">WiFi name</string>
+<string name="select_wifi">Select your WiFi</string>
 <string name="show_password">Show password</string>
 <string name="ok">OK</string>
 <string name="cancel">Cancel</string>
 <string name="pick_a_network">Pick a network</string>
-<string name="wifi_id">Wifi id</string>
+<string name="wifi_id">WiFi id</string>
 <string name="yes">Yes</string>
 <string name="no">No</string>
-<string name="wifi_enable_question">Wifi is disabled. Do you wish to enable it ?</string>
-<string name="wifi_enable_error">Unable to turn on Wifi on your device.\nPlease manually enable Wifi and try again.</string>
-<string name="connect_description">- press to connect to wifi -</string>
+<string name="wifi_enable_question">WiFi is disabled. Do you wish to enable it ?</string>
+<string name="wifi_enable_error">Unable to turn on WiFi on your device.\nPlease manually enable WiFi and try again.</string>
+<string name="connect_description">- press to connect to WiFi -</string>
 <string name="downloading">Downloading&#8230;</string>
 <string name="new_version_update_question">Newer version available.\nDo you wish to update ?</string>
 <string name="download_starting">Download starting&#8230;</string>
 <string name="connect_success">Successfully connected.</string>
 <string name="connecting">Connecting&#8230;</string>
 <string name="connect_fail">Connection failed.</string>
-<string name="unknown_wifi">Unknown Wifi. Unable to connect.</string>
+<string name="unknown_wifi">Unknown WiFi. Unable to connect.</string>
 <string name="already_connected">Already connected.</string>
-<string name="wifi_disabled">Wifi disabled. Enable Wifi to connect.</string>
+<string name="wifi_disabled">WiFi disabled. Enable WiFi to connect.</string>
 <string name="credentials_not_found">No credentials found. Configure credentials first.</string>
 <string name="share_app_text">Hey! you can download the %1$s app by visiting %2$s</string>
 <string name="share_using">Share using</string>
 <string name="logo">Application Logo</string>
 <string name="save">Save</string>
-<string name="saved_data">WIFI data saved</string>
-<string name="save_failed_ssid_missing">Saving failed, WIFI data missing</string>
+<string name="saved_data">WiFi data saved</string>
+<string name="save_failed_ssid_missing">Saving failed, WiFi data missing</string>
 <string name="save_failed_username_missing">Saving failed, username missing</string>
 <string name="save_failed_password_missing">Saving failed, password missing</string>
 
diff --git a/WiFiConnect/src/com/wifi/sapguestconnect/WiFiConnect.java b/WiFiConnect/src/com/wifi/sapguestconnect/WiFiConnect.java
index a53ed75..cc2c626 100644
--- a/WiFiConnect/src/com/wifi/sapguestconnect/WiFiConnect.java
+++ b/WiFiConnect/src/com/wifi/sapguestconnect/WiFiConnect.java
@@ -309,9 +309,9 @@ public boolean onCreateOptionsMenu(Menu menu)
 		MenuItem wifiConfigMenuItem = menu.add(base_group_id++, // Group ID
 												base_item_id++,  // Item ID
 												base_order_id++, 	// Order ID			
-											"Wifi Config"); // Title
+												mResources.getString(R.string.menu_wifi_settings)); // Title
 
-		wifiConfigMenuItem.setIcon(R.drawable.light_48);
+		wifiConfigMenuItem.setIcon(R.drawable.wifi_48);
 		
 		wifiConfigMenuItem.setOnMenuItemClickListener(
 				new OnMenuItemClickListener() {