diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 636530c5..14d82d9c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
             android:hardwareAccelerated="true"
             android:icon="@drawable/ic_launcher"
             android:backupAgent=".ShadowsocksBackupAgent"
-            android:label="@string/screen_name">
+            android:label="@string/app_name">
 
         <meta-data android:name="com.google.android.backup.api_key"
                    android:value="AEdPqrEAAAAI_zVxZthz2HDuz9toTvkYvL0L5GA-OjeUIfBeXg"/>
@@ -32,7 +32,7 @@
 
         <activity
                 android:name=".Shadowsocks"
-                android:label="@string/screen_name"
+                android:label="@string/app_name"
                 android:theme="@style/Theme.Shadowsocks"
                 android:launchMode="singleTask">
             <intent-filter>
diff --git a/src/main/res/layout/layout_switch.xml b/src/main/res/layout/layout_switch.xml
index 3d0aabc6..97bfcf70 100644
--- a/src/main/res/layout/layout_switch.xml
+++ b/src/main/res/layout/layout_switch.xml
@@ -11,7 +11,7 @@
       android:gravity="center_vertical"
       android:textSize="24sp"
       android:textColor="@color/title"
-      android:text="@string/app_name"
+      android:text="@string/screen_name"
       android:layout_alignParentLeft="true"
       android:layout_centerVertical="true"/>
 
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index ac8b36df..96a75268 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="app_name">shadowsocks</string>
-  <string name="screen_name">影梭</string>
+  <string name="app_name">影梭</string>
+  <string name="screen_name">shadowsocks</string>
   <string name="function_cat">服务控制</string>
   <string name="service_controller">代理开关</string>
   <string name="service_summary">启动/关闭后台服务</string>
@@ -38,7 +38,7 @@
   <string name="traffic_stat_summary">在通知栏上显示当前上下行速率</string>
   <string name="forward_success">后台服务已开始运行。</string>
   <string name="service_running">已连接到 %s。</string>
-  <string name="service_status" formatted="false">当前速度：%d KB/s</string>
+  <string name="service_status" formatted="false">当前速率：%d KB/s</string>
   <string name="forward_fail">后台服务启动失败。</string>
   <string name="service_stopped">后台服务已停止。</string>
   <string name="forward_stop">后台服务已停止。</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2556175e..91892831 100755
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string name="app_name">shadowsocks</string>
-  <string name="screen_name">ss</string>
+  <string name="screen_name">shadowsocks</string>
 
   <!-- function category -->
   <string name="function_cat">Service Controller</string>
@@ -49,7 +49,7 @@
   <!-- notification category -->
   <string name="forward_success">Shadowsocks started.</string>
   <string name="service_running">Connected to %s.</string>
-  <string name="service_status" formatted="false">Current Speed: %d KB/s</string>
+  <string name="service_status" formatted="false">Current Rate: %d KB/s</string>
   <string name="forward_fail">Shadowsocks failed to start.</string>
   <string name="service_stopped">Shadowsocks stopped.</string>
   <string name="forward_stop">Shadowsocks stopped.</string>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
index b5e3862c..f1b84ac6 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
@@ -350,7 +350,7 @@ class ShadowVpnService extends VpnService {
       .setSmallIcon(R.drawable.ic_stat_shadowsocks)
       .setWhen(0)
       .setTicker(title)
-      .setContentTitle(getString(R.string.screen_name))
+      .setContentTitle(getString(R.string.app_name))
       .setContentText(info)
       .setContentIntent(contentIntent)
       .setAutoCancel(true)
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index b0dde940..ec9ac156 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -514,11 +514,10 @@ class Shadowsocks
     getSupportActionBar.setCustomView(switchLayout)
     getSupportActionBar.setDisplayShowTitleEnabled(false)
     getSupportActionBar.setDisplayShowCustomEnabled(true)
-    // getSupportActionBar.setDisplayShowHomeEnabled(false)
+    getSupportActionBar.setIcon(R.drawable.ic_stat_shadowsocks)
     val title: TextView = switchLayout.findViewById(R.id.title).asInstanceOf[TextView]
     val tf: Typeface = Typefaces.get(this, "fonts/Iceland.ttf")
     if (tf != null) title.setTypeface(tf)
-    title.setText(R.string.app_name)
 
     switchButton = switchLayout.findViewById(R.id.switchButton).asInstanceOf[Switch]
 
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
index 36b38105..580d368b 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
@@ -358,7 +358,7 @@ class ShadowsocksService extends Service {
     builder
       .setWhen(0)
       .setTicker(title)
-      .setContentTitle(getString(R.string.screen_name))
+      .setContentTitle(getString(R.string.app_name))
       .setContentText(info)
       .setContentIntent(contentIntent)
       .addAction(android.R.drawable.ic_menu_close_clear_cancel, getString(R.string.stop),
@@ -376,7 +376,7 @@ class ShadowsocksService extends Service {
       .setSmallIcon(R.drawable.ic_stat_shadowsocks)
       .setWhen(0)
       .setTicker(title)
-      .setContentTitle(getString(R.string.screen_name))
+      .setContentTitle(getString(R.string.app_name))
       .setContentText(info)
       .setContentIntent(contentIntent)
       .setAutoCancel(true)