diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 500574a9..7036668e 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,11 +20,12 @@
     <application
             android:name=".ShadowsocksApplication"
             android:hardwareAccelerated="true"
-            android:icon="@drawable/icon"
+            android:icon="@drawable/ic_launcher"
             android:label="@string/app_name">
         <activity
                 android:name=".Shadowsocks"
                 android:label="@string/app_name"
+                android:theme="@style/Theme.GAEProxy"
                 android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/assets/local.js b/assets/local.js
index eeadd538..19cad5fe 100644
--- a/assets/local.js
+++ b/assets/local.js
@@ -164,6 +164,8 @@
 
   console.log("calculating ciphers");
 
+  console.log = function() {};
+
   tables = getTable(KEY);
 
   encryptTable = tables[0];
@@ -186,7 +188,8 @@
       var aServer, addrtype, buf, cmd, reply, tempBuf;
       if (stage === 5) {
         encrypt(encryptTable, data);
-        if (!remote.write(data)) {
+        // Android Patch
+        if (data == null || !remote.write(data)) {
           connection.pause();
         }
         return;
diff --git a/res/drawable-hdpi-v11/ic_stat_gaeproxy.png b/res/drawable-hdpi-v11/ic_stat_gaeproxy.png
deleted file mode 100755
index 87d80079..00000000
Binary files a/res/drawable-hdpi-v11/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-hdpi-v11/ic_stat_shadowsocks.png b/res/drawable-hdpi-v11/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..546a5922
Binary files /dev/null and b/res/drawable-hdpi-v11/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-hdpi-v9/ic_stat_gaeproxy.png b/res/drawable-hdpi-v9/ic_stat_gaeproxy.png
deleted file mode 100755
index ff7dd684..00000000
Binary files a/res/drawable-hdpi-v9/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-hdpi-v9/ic_stat_shadowsocks.png b/res/drawable-hdpi-v9/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..8faecf2b
Binary files /dev/null and b/res/drawable-hdpi-v9/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
new file mode 100755
index 00000000..3d38f94b
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher.png differ
diff --git a/res/drawable-hdpi/ic_stat_gaeproxy.png b/res/drawable-hdpi/ic_stat_gaeproxy.png
deleted file mode 100755
index 7915f888..00000000
Binary files a/res/drawable-hdpi/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_stat_shadowsocks.png b/res/drawable-hdpi/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..06fd9fe5
Binary files /dev/null and b/res/drawable-hdpi/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
deleted file mode 100644
index 80cdaa7d..00000000
Binary files a/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/res/drawable-ldpi-v11/ic_stat_gaeproxy.png b/res/drawable-ldpi-v11/ic_stat_gaeproxy.png
deleted file mode 100755
index 0682f157..00000000
Binary files a/res/drawable-ldpi-v11/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-ldpi-v11/ic_stat_shadowsocks.png b/res/drawable-ldpi-v11/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..3c78b32c
Binary files /dev/null and b/res/drawable-ldpi-v11/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-ldpi-v9/ic_stat_gaeproxy.png b/res/drawable-ldpi-v9/ic_stat_gaeproxy.png
deleted file mode 100755
index acb9f873..00000000
Binary files a/res/drawable-ldpi-v9/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-ldpi-v9/ic_stat_shadowsocks.png b/res/drawable-ldpi-v9/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..d711bedc
Binary files /dev/null and b/res/drawable-ldpi-v9/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-ldpi/ic_stat_gaeproxy.png b/res/drawable-ldpi/ic_stat_gaeproxy.png
deleted file mode 100755
index 5d24f04f..00000000
Binary files a/res/drawable-ldpi/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
deleted file mode 100644
index 566cd440..00000000
Binary files a/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_stat_gaeproxy.png b/res/drawable-mdpi-v11/ic_stat_gaeproxy.png
deleted file mode 100755
index 1e36c79b..00000000
Binary files a/res/drawable-mdpi-v11/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-mdpi-v11/ic_stat_shadowsocks.png b/res/drawable-mdpi-v11/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..9beeba39
Binary files /dev/null and b/res/drawable-mdpi-v11/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-mdpi-v9/ic_stat_gaeproxy.png b/res/drawable-mdpi-v9/ic_stat_gaeproxy.png
deleted file mode 100755
index 46fd0ad8..00000000
Binary files a/res/drawable-mdpi-v9/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-mdpi-v9/ic_stat_shadowsocks.png b/res/drawable-mdpi-v9/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..871ba898
Binary files /dev/null and b/res/drawable-mdpi-v9/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
new file mode 100755
index 00000000..792e5757
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher.png differ
diff --git a/res/drawable-mdpi/ic_stat_gaeproxy.png b/res/drawable-mdpi/ic_stat_gaeproxy.png
deleted file mode 100755
index aaba1b9c..00000000
Binary files a/res/drawable-mdpi/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_stat_shadowsocks.png b/res/drawable-mdpi/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..d208936b
Binary files /dev/null and b/res/drawable-mdpi/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
deleted file mode 100644
index e329c02b..00000000
Binary files a/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_stat_gaeproxy.png b/res/drawable-xhdpi-v11/ic_stat_gaeproxy.png
deleted file mode 100755
index e319e267..00000000
Binary files a/res/drawable-xhdpi-v11/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png b/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..a757df53
Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-xhdpi-v9/ic_stat_gaeproxy.png b/res/drawable-xhdpi-v9/ic_stat_gaeproxy.png
deleted file mode 100755
index de3e66a2..00000000
Binary files a/res/drawable-xhdpi-v9/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-xhdpi-v9/ic_stat_shadowsocks.png b/res/drawable-xhdpi-v9/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..2dc7efff
Binary files /dev/null and b/res/drawable-xhdpi-v9/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
new file mode 100755
index 00000000..ede49ed4
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/drawable-xhdpi/ic_stat_gaeproxy.png b/res/drawable-xhdpi/ic_stat_gaeproxy.png
deleted file mode 100755
index e68bccfd..00000000
Binary files a/res/drawable-xhdpi/ic_stat_gaeproxy.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_stat_shadowsocks.png b/res/drawable-xhdpi/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..3b263ad6
Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_shadowsocks.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
new file mode 100755
index 00000000..ed27ead0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/res/layout/layout_progress_bar.xml b/res/layout/layout_progress_bar.xml
index 195e7f62..99b49a99 100644
--- a/res/layout/layout_progress_bar.xml
+++ b/res/layout/layout_progress_bar.xml
@@ -4,7 +4,7 @@
 	android:layout_height="fill_parent">
 	<ImageView android:id="@+id/image" android:layout_width="wrap_content"
 		android:layout_height="fill_parent" android:layout_marginLeft="10dp"
-		android:layout_marginRight="10dp" android:src="@drawable/icon" />
+		android:layout_marginRight="10dp" android:src="@drawable/ic_launcher" />
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:orientation="vertical">
diff --git a/res/layout/main.xml b/res/layout/main.xml
deleted file mode 100755
index 3c196e63..00000000
--- a/res/layout/main.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:myapp="http://schemas.android.com/apk/res/v.sched.quite"
-    android:id="@+id/mainLayout"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:drawSelectorOnTop="false"
-        android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100755
index 00000000..ec5c08e5
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Zirco Browser for Android
+  
+   Copyright (C) 2010 - 2011 J. Devauchelle and contributors.
+ 
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   version 3 as published by the Free Software Foundation.
+ 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+-->
+
+<resources>
+
+    <!-- Variation on the Light theme that turns off the title -->
+    <style name="Theme.GAEProxy" parent="android:Theme.Holo.Light"/>
+
+</resources>
\ No newline at end of file
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 06483ed3..2fef313a 100755
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -83,5 +83,8 @@
     <string name="system_proxy">系统代理</string>
     <string name="system_proxy_summary">设置系统代理，无需ROOT权限，仅工作在Android 4.0及以上系统，并仅对当前Wifi连接生效</string>
 
+    <string name="remote_port">远程端口</string>
+    <string name="remote_port_summary">Shadowsocks服务器端口</string>
+
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d4d1aa2e..5d3d3562 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,33 +16,7 @@
 
 <resources>
 
-    <!-- Base application theme is the default theme -->
-    <style name="Theme" parent="android:Theme" />
-
     <!-- Variation on the Light theme that turns off the title -->
-    <style name="Theme.GAEProxy" parent="@android:style/Theme">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        
-    </style>
-
-    <style name="Bookmarks"></style>
-
-    <style name="Bookmarks.Title">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="History"></style>
-
-    <style name="History.Title">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
-    <style name="History.Url">
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#888888</item>
-    </style>
+    <style name="Theme.GAEProxy" parent="android:Theme.Light"/>
 
 </resources>
\ No newline at end of file
diff --git a/src/com/github/shadowsocks/Shadowsocks.java b/src/com/github/shadowsocks/Shadowsocks.java
index 7511ff24..e697586a 100644
--- a/src/com/github/shadowsocks/Shadowsocks.java
+++ b/src/com/github/shadowsocks/Shadowsocks.java
@@ -200,7 +200,6 @@ public class Shadowsocks extends PreferenceActivity implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.main);
         addPreferencesFromResource(R.xml.shadowsocks_preference);
 
         proxyText = (EditTextPreference) findPreference("proxy");
diff --git a/src/com/github/shadowsocks/ShadowsocksService.java b/src/com/github/shadowsocks/ShadowsocksService.java
index 0db8ebcc..144f0f59 100755
--- a/src/com/github/shadowsocks/ShadowsocksService.java
+++ b/src/com/github/shadowsocks/ShadowsocksService.java
@@ -319,7 +319,7 @@ public class ShadowsocksService extends Service {
     }
 
     private void notifyAlert(String title, String info) {
-        notification.icon = R.drawable.ic_stat_gaeproxy;
+        notification.icon = R.drawable.ic_stat_shadowsocks;
         notification.tickerText = title;
         notification.flags = Notification.FLAG_ONGOING_EVENT;
         initSoundVibrateLights(notification);
@@ -330,7 +330,7 @@ public class ShadowsocksService extends Service {
     }
 
     private void notifyAlert(String title, String info, int flags) {
-        notification.icon = R.drawable.ic_stat_gaeproxy;
+        notification.icon = R.drawable.ic_stat_shadowsocks;
         notification.tickerText = title;
         notification.flags = flags;
         initSoundVibrateLights(notification);