diff --git a/mobile/src/main/res/drawable-hdpi/ic_add.png b/mobile/src/main/res/drawable-hdpi/ic_add.png
deleted file mode 100644
index 0bf6510..0000000
Binary files a/mobile/src/main/res/drawable-hdpi/ic_add.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-hdpi/ic_scan_code.png b/mobile/src/main/res/drawable-hdpi/ic_scan_code.png
deleted file mode 100644
index e74a8a0..0000000
Binary files a/mobile/src/main/res/drawable-hdpi/ic_scan_code.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-hdpi/ic_search.png b/mobile/src/main/res/drawable-hdpi/ic_search.png
deleted file mode 100644
index c22a443..0000000
Binary files a/mobile/src/main/res/drawable-hdpi/ic_search.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-hdpi/ic_shortcut_add.png b/mobile/src/main/res/drawable-hdpi/ic_shortcut_add.png
new file mode 100755
index 0000000..4ff0b91
Binary files /dev/null and b/mobile/src/main/res/drawable-hdpi/ic_shortcut_add.png differ
diff --git a/mobile/src/main/res/drawable-hdpi/ic_shortcut_filter_center_focus.png b/mobile/src/main/res/drawable-hdpi/ic_shortcut_filter_center_focus.png
new file mode 100755
index 0000000..9b637d8
Binary files /dev/null and b/mobile/src/main/res/drawable-hdpi/ic_shortcut_filter_center_focus.png differ
diff --git a/mobile/src/main/res/drawable-hdpi/ic_shortcut_search.png b/mobile/src/main/res/drawable-hdpi/ic_shortcut_search.png
new file mode 100755
index 0000000..b228c4a
Binary files /dev/null and b/mobile/src/main/res/drawable-hdpi/ic_shortcut_search.png differ
diff --git a/mobile/src/main/res/drawable-mdpi/ic_add.png b/mobile/src/main/res/drawable-mdpi/ic_add.png
deleted file mode 100644
index 0c95f38..0000000
Binary files a/mobile/src/main/res/drawable-mdpi/ic_add.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-mdpi/ic_scan_code.png b/mobile/src/main/res/drawable-mdpi/ic_scan_code.png
deleted file mode 100644
index fe4040c..0000000
Binary files a/mobile/src/main/res/drawable-mdpi/ic_scan_code.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-mdpi/ic_search.png b/mobile/src/main/res/drawable-mdpi/ic_search.png
deleted file mode 100644
index 4a6a7e7..0000000
Binary files a/mobile/src/main/res/drawable-mdpi/ic_search.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-mdpi/ic_shortcut_add.png b/mobile/src/main/res/drawable-mdpi/ic_shortcut_add.png
new file mode 100755
index 0000000..1dad43d
Binary files /dev/null and b/mobile/src/main/res/drawable-mdpi/ic_shortcut_add.png differ
diff --git a/mobile/src/main/res/drawable-mdpi/ic_shortcut_filter_center_focus.png b/mobile/src/main/res/drawable-mdpi/ic_shortcut_filter_center_focus.png
new file mode 100755
index 0000000..66ac186
Binary files /dev/null and b/mobile/src/main/res/drawable-mdpi/ic_shortcut_filter_center_focus.png differ
diff --git a/mobile/src/main/res/drawable-mdpi/ic_shortcut_search.png b/mobile/src/main/res/drawable-mdpi/ic_shortcut_search.png
new file mode 100755
index 0000000..8f296f4
Binary files /dev/null and b/mobile/src/main/res/drawable-mdpi/ic_shortcut_search.png differ
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_add.png b/mobile/src/main/res/drawable-xhdpi/ic_add.png
deleted file mode 100644
index 09bd14b..0000000
Binary files a/mobile/src/main/res/drawable-xhdpi/ic_add.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_scan_code.png b/mobile/src/main/res/drawable-xhdpi/ic_scan_code.png
deleted file mode 100644
index 2c7928b..0000000
Binary files a/mobile/src/main/res/drawable-xhdpi/ic_scan_code.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_search.png b/mobile/src/main/res/drawable-xhdpi/ic_search.png
deleted file mode 100644
index 9b7de14..0000000
Binary files a/mobile/src/main/res/drawable-xhdpi/ic_search.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_shortcut_add.png b/mobile/src/main/res/drawable-xhdpi/ic_shortcut_add.png
new file mode 100755
index 0000000..2ff26e7
Binary files /dev/null and b/mobile/src/main/res/drawable-xhdpi/ic_shortcut_add.png differ
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_shortcut_filter_center_focus.png b/mobile/src/main/res/drawable-xhdpi/ic_shortcut_filter_center_focus.png
new file mode 100755
index 0000000..d09ac57
Binary files /dev/null and b/mobile/src/main/res/drawable-xhdpi/ic_shortcut_filter_center_focus.png differ
diff --git a/mobile/src/main/res/drawable-xhdpi/ic_shortcut_search.png b/mobile/src/main/res/drawable-xhdpi/ic_shortcut_search.png
new file mode 100755
index 0000000..5f19c14
Binary files /dev/null and b/mobile/src/main/res/drawable-xhdpi/ic_shortcut_search.png differ
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_add.png b/mobile/src/main/res/drawable-xxhdpi/ic_add.png
deleted file mode 100644
index ca5e9ed..0000000
Binary files a/mobile/src/main/res/drawable-xxhdpi/ic_add.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_scan_code.png b/mobile/src/main/res/drawable-xxhdpi/ic_scan_code.png
deleted file mode 100644
index 858fa6c..0000000
Binary files a/mobile/src/main/res/drawable-xxhdpi/ic_scan_code.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_search.png b/mobile/src/main/res/drawable-xxhdpi/ic_search.png
deleted file mode 100644
index ab7bc0b..0000000
Binary files a/mobile/src/main/res/drawable-xxhdpi/ic_search.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_add.png b/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_add.png
new file mode 100755
index 0000000..0200dd0
Binary files /dev/null and b/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_add.png differ
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_filter_center_focus.png b/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_filter_center_focus.png
new file mode 100755
index 0000000..59e1804
Binary files /dev/null and b/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_filter_center_focus.png differ
diff --git a/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_search.png b/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_search.png
new file mode 100755
index 0000000..7167115
Binary files /dev/null and b/mobile/src/main/res/drawable-xxhdpi/ic_shortcut_search.png differ
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_add.png b/mobile/src/main/res/drawable-xxxhdpi/ic_add.png
deleted file mode 100644
index 6bdc9e6..0000000
Binary files a/mobile/src/main/res/drawable-xxxhdpi/ic_add.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_scan_code.png b/mobile/src/main/res/drawable-xxxhdpi/ic_scan_code.png
deleted file mode 100644
index 20d888e..0000000
Binary files a/mobile/src/main/res/drawable-xxxhdpi/ic_scan_code.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_search.png b/mobile/src/main/res/drawable-xxxhdpi/ic_search.png
deleted file mode 100644
index 813f463..0000000
Binary files a/mobile/src/main/res/drawable-xxxhdpi/ic_search.png and /dev/null differ
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_add.png b/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_add.png
new file mode 100755
index 0000000..9c6b49c
Binary files /dev/null and b/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_add.png differ
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_filter_center_focus.png b/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_filter_center_focus.png
new file mode 100755
index 0000000..75cbaf7
Binary files /dev/null and b/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_filter_center_focus.png differ
diff --git a/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_search.png b/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_search.png
new file mode 100755
index 0000000..71a85e2
Binary files /dev/null and b/mobile/src/main/res/drawable-xxxhdpi/ic_shortcut_search.png differ
diff --git a/mobile/src/main/res/drawable/qr_code_bg.9.png b/mobile/src/main/res/drawable/qr_code_bg.9.png
old mode 100644
new mode 100755
index dc6316d..987c3d5
Binary files a/mobile/src/main/res/drawable/qr_code_bg.9.png and b/mobile/src/main/res/drawable/qr_code_bg.9.png differ
diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
index 769db5a..23ae38e 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~  Copyright(c) 2017 lizhaotailang
   ~
@@ -20,66 +21,178 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
-    <string name="activity_package_details">包裹详情</string>
+    <!--activities-->
+    <string name="activity_package_details">包裹詳情</string>
     <string name="activity_add_package">添加包裹</string>
-    <string name="activity_company_details">公司详情</string>
+    <string name="activity_company_details">公司詳情</string>
+    <string name="activity_search">搜索</string>
+    <string name="activity_scan_code">掃描</string>
+    <!--activities end-->
 
+    <!--navigation drawer-->
+    <string name="nav_home">首頁</string>
+    <string name="nav_companies">快遞公司</string>
+    <string name="nav_switch_theme">日/夜間模式</string>
+    <string name="nav_settings">設置</string>
+    <string name="nav_about">關於</string>
+    <!--navigation drawer end-->
+
+    <!--package list page-->
+    <string name="all">全部</string>
+    <string name="on_the_way">運輸中</string>
+    <string name="delivered">已送達</string>
     <string name="action_search">搜索</string>
-    <string name="nav_home">首页</string>
-    <string name="nav_companies">公司</string>
-    <string name="nav_switch_theme">夜间模式</string>
-    <string name="nav_settings">设置</string>
-    <string name="nav_about">关于</string>
-    <string name="package_status">物流信息</string>
-    <string name="company_name">公司名称</string>
-    <string name="package_number">单号</string>
+    <string name="mark_all_read">全部标记为已读</string>
     <string name="share">分享</string>
     <string name="delete">删除</string>
     <string name="copy_code">复制运单号</string>
     <string name="set_unread">标记为未读</string>
     <string name="set_read">标记为已读</string>
-    <string name="scan_code">扫描运单号</string>
-
-    <string name="all">全部</string>
-    <string name="on_the_way">运输中</string>
-    <string name="delivered">已送达</string>
-
-    <string name="wrong_number_and_check">单号错误，请检查后重试</string>
-    <string name="require_permission">需要授予权限才能运行！</string>
-    <string name="go_to_settings">去设置</string>
-    <string name="phone_number">电话号码</string>
-    <string name="official_website">官方网站</string>
-    <string name="mark_all_read">全部标记为已读</string>
-    <string name="package_name_default_pre">快递</string>
-    <string name="package_name">快递名称</string>
-    <string name="get_status_error">无法获取最新状态</string>
     <string name="remove">移除</string>
-    <string name="package_number_copied">单号已复制到剪贴板</string>
-    <string name="latest_status">最新状态:&#160;</string>
-    <string name="something_wrong">发生了一些错误…</string>
+    <string name="get_status_error">无法获取物流信息。</string>
+    <string name="network_error">网络连接错误，请稍后重试。</string>
+    <string name="package_number_copied">运单号已复制到剪贴板。</string>
+    <string name="package_removed_msg">已被移除。</string>
     <string name="undo">撤销</string>
-    <string name="package_removed_msg">删除成功</string>
-    <string name="package_exist">运单已存在</string>
-    <string name="permission_denied">权限被拒绝</string>
-    <string name="deliver_man">快递员</string>
-    <string name="error">出错了</string>
-    <string name="unable_to_open_camera">相机打开出错，请稍后重试</string>
-    <string name="all_packages_are_delivered">所有包裹均已送达。</string>
-    <string name="to_add_packages">点击"添加"按钮新建包裹。</string>
-    <string name="delete_package_massage">你将不再跟踪这个包裹的物流信息。</string>
-    <string name="edit_name">编辑名称</string>
-    <string name="input_empty">包裹名称不能为空！</string>
-    <string name="network_error">Network error, try again later.</string>
-    <string name="retry">RETRY</string>
-
+    <string name="go_to_settings">去设置</string>
+    <string name="to_add_packages">点击添加按钮添加包裹。</string>
+    <string name="latest_status">最新状态:&#160;</string>
     <string-array name="package_status">
         <item>运输中</item>
-        <item>其它</item>
+        <item>其他</item>
         <item>错误</item>
         <item>已送达</item>
         <item>已退回</item>
-        <item>派送中</item>
+        <item>正在派送</item>
         <item>退回中</item>
     </string-array>
+    <!--package list page end-->
+
+    <!--package details-->
+    <string name="package_status">物流信息</string>
+    <string name="company_name">公司名称</string>
+    <string name="package_number">运单号码</string>
+    <string name="package_name">包裹名称</string>
+    <string name="delete_package_massage">你将不再跟踪这个包裹的物流信息。</string>
+    <string name="deliver_man">快递员</string>
+    <string name="edit_name">编辑包裹名称</string>
+    <string name="input_empty">包裹名称不能为空!</string>
+    <string name="retry">重试</string>
+    <!--package details end-->
+
+    <!--add package-->
+    <string name="scan_code">扫描</string>
+    <string name="tint_package_name">名称(可选)</string>
+    <string name="tint_package_number">运单号</string>
+    <string name="wrong_number_and_check">无效的运单号，请检查后重试。</string>
+    <string name="require_permission">你需要授予相机权限才能使用扫描功能。</string>
+    <string name="package_name_default_pre">包裹</string>
+    <string name="package_exist">运单号已经在你的列表里了，请不要重复添加。</string>
+    <string name="permission_denied">权限被拒绝</string>
+    <string name="error">错误</string>
+    <string name="something_wrong">发生了一些错误…</string>
+    <string name="unable_to_open_camera">无法打开相机，请检查后重试。</string>
+    <!--add package end-->
+
+    <!--company details-->
+    <string name="phone_number">电话号码</string>
+    <string name="official_website">官方网站</string>
+    <!--company details end-->
+
+    <!--Settings-->
+    <string name="notifications">通知</string>
+    <string name="alert">推送通知</string>
+    <string name="alert_desc">当包裹的物流信息更新后推送通知。</string>
+    <string name="do_not_disturb_mode">请勿打扰</string>
+    <string name="do_not_disturb_mode_desc">在设定时间内不推送通知。</string>
+    <string name="start_time">开始时间</string>
+    <string name="start_time_desc">23:00</string>
+    <string name="end_time">结束时间</string>
+    <string name="end_time_desc">06:00</string>
+    <string name="notification_interval">通知频率</string>
+    <string name="browser">浏览器</string>
+    <string name="custom_tabs">Chrome custom tabs</string>
+    <string name="custom_tabs_desc">使用Chrome Custom Tabs打开应用内的链接。</string>
+    <string name="user_interface">用户界面</string>
+    <string name="navigation_bar_tint">导航栏变色</string>
+    <string name="navigation_bar_tint_desc">为导航栏着色</string>
+    <string name="navigation_bar_restart_msg">重启应用后生效。</string>
+    <string-array name="notification_interval">
+        <item>10 分钟</item>
+        <item>30 分钟</item>
+        <item>1 小时</item>
+        <item>1.5 小时</item>
+        <item>2 小时</item>
+    </string-array>
+    <string-array name="notification_interval_item">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!--Settings end-->
+
+    <!--About-->
+    <string name="version">版本</string>
+    <string name="rate">评分</string>
+    <string name="rate_desc">如果你喜欢Espresso App, 请给她好评吧。</string>
+    <string name="licenses">开源代码许可证</string>
+    <string name="thanks">致谢</string>
+    <string name="thanks_1">FengGo</string>
+    <string name="thanks_1_desc">水表助手项目</string>
+    <string name="thanks_1_url">https://github.com/fython/PackageTracker</string>
+    <string name="thanks_2">翟宅宅Jack</string>
+    <string name="thanks_2_desc">美工</string>
+    <string name="thanks_2_url">https://plus.google.com/+YoulunZhai</string>
+    <string name="source_code">GitHub源代码</string>
+    <string name="source_code_desc">https://github.com/TonnyL/Espresso</string>
+    <string name="support">支持</string>
+    <string name="send_advices">发送建议</string>
+    <string name="mail_account">mailto:marktonymengyi@gmail.com</string>
+    <string name="mail_topic">Espresso Advices</string>
+    <string name="send_advices_desc">帮助我改进Espresso App</string>
+    <string name="donate">捐赠</string>
+    <string name="donate_account">marktonymengyi@gmail.com</string>
+    <string name="donate_desc">为我买一杯咖啡, 让我在夜晚写代码时仍然保持清醒。</string>
+    <string name="donate_msg">支付宝账号将被复制到剪贴板, 打开支付宝并粘贴账号即可完成捐赠。感谢你的支持!</string>
+    <string name="set_end_time_error">开始与结束的时间不能相同。</string>
+    <string name="notification_new_message">\"包裹有一条新物流信息。\"</string>
+    <!--About end-->
+
+    <!--shortcuts-->
+    <string name="shortcut_label_add_package">手动添加</string>
+    <string name="shortcut_label_search">搜索</string>
+    <string name="shortcut_label_scan_code">扫描</string>
+    <!--shortcuts end-->
+
+    <!--widget-->
+    <string name="all_packages_are_delivered">所有包裹均已送达。</string>
+    <!--widget end-->
+
+    <!--onboarding-->
+    <string name="onboarding_next_button_description">下一步</string>
+    <string name="onboarding_finish_button_description">完成</string>
+    <string name="onboarding_pre_button_description">上一步</string>
+    <string name="onboarding_section_1">简单快速地添加包裹</string>
+    <string name="onboarding_intro_1">支持全球640余家快递公司, 但当你添加包裹时, 快递公司的识别将被自动完成。</string>
+    <string name="onboarding_section_2">保持你的物流信息为最新状态</string>
+    <string name="onboarding_intro_2">当物流信息更新后, 你将收到通知提醒, 所以你的信息将保持最新。</string>
+    <string name="onboarding_section_3">和你的Android Wear设备保持同步</string>
+    <string name="onboarding_intro_3">你可以在Android Wear设备上完成一切操作。</string>
+    <string name="onboarding_finish_button_description_wait">准备中, 请稍后…</string>
+    <!--onboarding end-->
+
+    <!--search-->
+    <string name="no_result">无结果</string>
+    <string name="search_hint">包裹或公司…</string>
+    <string name="search_label_package">包裹</string>
+    <string name="search_label_company">快递公司</string>
+    <string name="item_loading">加载中…</string>
+    <!--search end-->
+
+    <!--custom tabs-->
+    <string name="error_no_browser">设备上没有安装浏览器。</string>
+    <!--custom tabs end-->
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-zh-rHK/strings.xml b/mobile/src/main/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..269ced7
--- /dev/null
+++ b/mobile/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  Copyright(c) 2017 lizhaotailang
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="app_name">Espresso</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <!--activities-->
+    <string name="activity_package_details">包裹詳情</string>
+    <string name="activity_add_package">添加包裹</string>
+    <string name="activity_company_details">公司詳情</string>
+    <string name="activity_search">搜索</string>
+    <string name="activity_scan_code">掃描</string>
+    <!--activities end-->
+
+    <!--navigation drawer-->
+    <string name="nav_home">首頁</string>
+    <string name="nav_companies">快遞公司</string>
+    <string name="nav_switch_theme">日/夜間模式</string>
+    <string name="nav_settings">設置</string>
+    <string name="nav_about">關於</string>
+    <!--navigation drawer end-->
+
+    <!--package list page-->
+    <string name="all">全部</string>
+    <string name="on_the_way">運輸中</string>
+    <string name="delivered">已送達</string>
+    <string name="action_search">搜索</string>
+    <string name="mark_all_read">全部標記為已讀</string>
+    <string name="share">分享</string>
+    <string name="delete">刪除</string>
+    <string name="copy_code">複製運單號</string>
+    <string name="set_unread">標記為未讀</string>
+    <string name="set_read">標記為已讀</string>
+    <string name="remove">移除</string>
+    <string name="get_status_error">無法獲取物流信息。</string>
+    <string name="network_error">網絡連接錯誤，請稍後重試。</string>
+    <string name="package_number_copied">運單號已複製到剪貼板。</string>
+    <string name="package_removed_msg">已被移除。</string>
+    <string name="undo">撤銷</string>
+    <string name="go_to_settings">去設置</string>
+    <string name="to_add_packages">點擊添加按鈕添加包裹。</string>
+    <string name="latest_status">最新狀態:&#160;</string>
+    <string-array name="package_status">
+        <item>運輸中</item>
+        <item>其他</item>
+        <item>錯誤</item>
+        <item>已送達</item>
+        <item>已退回</item>
+        <item>正在派送</item>
+        <item>退回中</item>
+    </string-array>
+    <!--package list page end-->
+
+    <!--package details-->
+    <string name="package_status">物流信息</string>
+    <string name="company_name">公司名稱</string>
+    <string name="package_number">運單號碼</string>
+    <string name="package_name">包裹名稱</string>
+    <string name="delete_package_massage">你將不再跟蹤這個包裹的物流信息。</string>
+    <string name="deliver_man">快遞員</string>
+    <string name="edit_name">編輯包裹名稱</string>
+    <string name="input_empty">包裹名稱不能為空!</string>
+    <string name="retry">重試</string>
+    <!--package details end-->
+
+    <!--add package-->
+    <string name="scan_code">掃描</string>
+    <string name="tint_package_name">名稱(可選)</string>
+    <string name="tint_package_number">運單號</string>
+    <string name="wrong_number_and_check">無效的運單號，請檢查後重試。</string>
+    <string name="require_permission">你需要授予相機權限才能使用掃描功能。</string>
+    <string name="package_name_default_pre">包裹</string>
+    <string name="package_exist">運單號已經在你的列表裡了，請不要重複添加。</string>
+    <string name="permission_denied">權限被拒絕</string>
+    <string name="error">錯誤</string>
+    <string name="something_wrong">發生了一些錯誤…</string>
+    <string name="unable_to_open_camera">無法打開相機，請檢查後重試。</string>
+    <!--add package end-->
+
+    <!--company details-->
+    <string name="phone_number">電話號碼</string>
+    <string name="official_website">官方網站</string>
+    <!--company details end-->
+
+    <!--Settings-->
+    <string name="notifications">通知</string>
+    <string name="alert">推送通知</string>
+    <string name="alert_desc">當包裹的物流信息更新後推送通知。</string>
+    <string name="do_not_disturb_mode">請勿打擾</string>
+    <string name="do_not_disturb_mode_desc">在設定時間內不推送通知。</string>
+    <string name="start_time">開始時間</string>
+    <string name="start_time_desc">23:00</string>
+    <string name="end_time">結束時間</string>
+    <string name="end_time_desc">06:00</string>
+    <string name="notification_interval">通知頻率</string>
+    <string name="browser">瀏覽器</string>
+    <string name="custom_tabs">Chrome custom tabs</string>
+    <string name="custom_tabs_desc">使用Chrome Custom Tabs打開應用內的鏈接。</string>
+    <string name="user_interface">用戶界面</string>
+    <string name="navigation_bar_tint">導航欄變色</string>
+    <string name="navigation_bar_tint_desc">為導航欄着色</string>
+    <string name="navigation_bar_restart_msg">重啟應用後生效。</string>
+    <string-array name="notification_interval">
+        <item>10 分鐘</item>
+        <item>30 分鐘</item>
+        <item>1 小時</item>
+        <item>1.5 小時</item>
+        <item>2 小時</item>
+    </string-array>
+    <string-array name="notification_interval_item">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!--Settings end-->
+
+    <!--About-->
+    <string name="version">版本</string>
+    <string name="rate">評分</string>
+    <string name="rate_desc">如果你喜歡Espresso App, 請給她好評吧。</string>
+    <string name="licenses">開源代碼許可證</string>
+    <string name="thanks">致謝</string>
+    <string name="thanks_1">FengGo</string>
+    <string name="thanks_1_desc">水表助手項目</string>
+    <string name="thanks_1_url">https://github.com/fython/PackageTracker</string>
+    <string name="thanks_2">翟宅宅Jack</string>
+    <string name="thanks_2_desc">美工</string>
+    <string name="thanks_2_url">https://plus.google.com/+YoulunZhai</string>
+    <string name="source_code">GitHub源代碼</string>
+    <string name="source_code_desc">https://github.com/TonnyL/Espresso</string>
+    <string name="support">支持</string>
+    <string name="send_advices">發送建議</string>
+    <string name="mail_account">mailto:marktonymengyi@gmail.com</string>
+    <string name="mail_topic">Espresso Advices</string>
+    <string name="send_advices_desc">幫助我改進Espresso App</string>
+    <string name="donate">捐贈</string>
+    <string name="donate_account">marktonymengyi@gmail.com</string>
+    <string name="donate_desc">為我買一杯咖啡, 讓我在夜晚寫代碼時仍然保持清醒。</string>
+    <string name="donate_msg">支付寶賬號將被複制到剪貼板, 打開支付寶並粘貼賬號即可完成捐贈。感謝你的支持!</string>
+    <string name="set_end_time_error">開始與結束的時間不能相同。</string>
+    <string name="notification_new_message">\"包裹有一條新物流信息。\"</string>
+    <!--About end-->
+
+    <!--shortcuts-->
+    <string name="shortcut_label_add_package">手動添加</string>
+    <string name="shortcut_label_search">搜索</string>
+    <string name="shortcut_label_scan_code">掃描</string>
+    <!--shortcuts end-->
+
+    <!--widget-->
+    <string name="all_packages_are_delivered">所有包裹均已送達。</string>
+    <!--widget end-->
+
+    <!--onboarding-->
+    <string name="onboarding_next_button_description">下一步</string>
+    <string name="onboarding_finish_button_description">完成</string>
+    <string name="onboarding_pre_button_description">上一步</string>
+    <string name="onboarding_section_1">簡單快速地添加包裹</string>
+    <string name="onboarding_intro_1">支持全球640餘家快遞公司, 但當你添加包裹時, 快遞公司的識別將被自動完成。</string>
+    <string name="onboarding_section_2">保持你的物流信息為最新狀態</string>
+    <string name="onboarding_intro_2">當物流信息更新後, 你將收到通知提醒, 所以你的信息將保持最新。</string>
+    <string name="onboarding_section_3">和你的Android Wear設備保持同步</string>
+    <string name="onboarding_intro_3">你可以在Android Wear設備上完成一切操作。</string>
+    <string name="onboarding_finish_button_description_wait">準備中, 請稍後…</string>
+    <!--onboarding end-->
+
+    <!--search-->
+    <string name="no_result">無結果</string>
+    <string name="search_hint">包裹或公司…</string>
+    <string name="search_label_package">包裹</string>
+    <string name="search_label_company">快遞公司</string>
+    <string name="item_loading">加載中…</string>
+    <!--search end-->
+
+    <!--custom tabs-->
+    <string name="error_no_browser">設備上沒有安裝瀏覽器。</string>
+    <!--custom tabs end-->
+
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-zh-rTW/strings.xml b/mobile/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..7b633fa
--- /dev/null
+++ b/mobile/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~  Copyright(c) 2017 lizhaotailang
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="app_name">Espresso</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    
+    <string name="activity_package_details">包裹詳情</string>
+    <string name="activity_add_package">添加包裹</string>
+    <string name="activity_company_details">公司詳情</string>
+    <string name="activity_search">搜索</string>
+    <string name="activity_scan_code">掃描</string>
+    <!--activities end-->
+
+    <!--navigation drawer-->
+    <string name="nav_home">首頁</string>
+    <string name="nav_companies">快遞公司</string>
+    <string name="nav_switch_theme">日/夜間模式</string>
+    <string name="nav_settings">設置</string>
+    <string name="nav_about">關於</string>
+    <!--navigation drawer end-->
+
+    <!--package list page-->
+    <string name="all">全部</string>
+    <string name="on_the_way">運輸中</string>
+    <string name="delivered">已送達</string>
+    <string name="action_search">搜索</string>
+    <string name="mark_all_read">全部標記為已讀</string>
+    <string name="share">分享</string>
+    <string name="delete">刪除</string>
+    <string name="copy_code">複製運單號</string>
+    <string name="set_unread">標記為未讀</string>
+    <string name="set_read">標記為已讀</string>
+    <string name="remove">移除</string>
+    <string name="get_status_error">無法獲取物流信息。</string>
+    <string name="network_error">網路連接錯誤，請稍後重試。</string>
+    <string name="package_number_copied">運單號已複製到剪貼板。</string>
+    <string name="package_removed_msg">已被移除。</string>
+    <string name="undo">撤銷</string>
+    <string name="go_to_settings">去設置</string>
+    <string name="to_add_packages">點擊添加按鈕添加包裹。</string>
+    <string name="latest_status">最新狀態: </string>
+    <string-array name="package_status">
+        <item>運輸中</item>
+        <item>其他</item>
+        <item>錯誤</item>
+        <item>已送達</item>
+        <item>已退回</item>
+        <item>正在派送</item>
+        <item>退回中</item>
+    </string-array>
+    <!--package list page end-->
+
+    <!--package details-->
+    <string name="package_status">物流信息</string>
+    <string name="company_name">公司名稱</string>
+    <string name="package_number">運單號碼</string>
+    <string name="package_name">包裹名稱</string>
+    <string name="delete_package_massage">你將不再跟蹤這個包裹的物流信息。</string>
+    <string name="deliver_man">快遞員</string>
+    <string name="edit_name">編輯包裹名稱</string>
+    <string name="input_empty">包裹名稱不能為空!</string>
+    <string name="retry">重試</string>
+    <!--package details end-->
+
+    <!--add package-->
+    <string name="scan_code">掃描</string>
+    <string name="tint_package_name">名稱(可選)</string>
+    <string name="tint_package_number">運單號</string>
+    <string name="wrong_number_and_check">無效的運單號，請檢查後重試。</string>
+    <string name="require_permission">你需要授予相機許可權才能使用掃描功能。</string>
+    <string name="package_name_default_pre">包裹</string>
+    <string name="package_exist">運單號已經在你的列表裡了，請不要重複添加。</string>
+    <string name="permission_denied">許可權被拒絕</string>
+    <string name="error">錯誤</string>
+    <string name="something_wrong">發生了一些錯誤…</string>
+    <string name="unable_to_open_camera">無法打開相機，請檢查後重試。</string>
+    <!--add package end-->
+
+    <!--company details-->
+    <string name="phone_number">電話號碼</string>
+    <string name="official_website">官方網站</string>
+    <!--company details end-->
+
+    <!--Settings-->
+    <string name="notifications">通知</string>
+    <string name="alert">推送通知</string>
+    <string name="alert_desc">當包裹的物流信息更新後推送通知。</string>
+    <string name="do_not_disturb_mode">請勿打擾</string>
+    <string name="do_not_disturb_mode_desc">在設定時間內不推送通知。</string>
+    <string name="start_time">開始時間</string>
+    <string name="start_time_desc">23:00</string>
+    <string name="end_time">結束時間</string>
+    <string name="end_time_desc">06:00</string>
+    <string name="notification_interval">通知頻率</string>
+    <string name="browser">瀏覽器</string>
+    <string name="custom_tabs">Chrome custom tabs</string>
+    <string name="custom_tabs_desc">使用Chrome Custom Tabs打開應用內的鏈接。</string>
+    <string name="user_interface">用戶界面</string>
+    <string name="navigation_bar_tint">導航欄變色</string>
+    <string name="navigation_bar_tint_desc">為導航欄著色</string>
+    <string name="navigation_bar_restart_msg">重啟應用後生效。</string>
+    <string-array name="notification_interval">
+        <item>10 分鐘</item>
+        <item>30 分鐘</item>
+        <item>1 小時</item>
+        <item>1.5 小時</item>
+        <item>2 小時</item>
+    </string-array>
+    <string-array name="notification_interval_item">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+    <!--Settings end-->
+
+    <!--About-->
+    <string name="version">版本</string>
+    <string name="rate">評分</string>
+    <string name="rate_desc">如果你喜歡Espresso App, 請給她好評吧。</string>
+    <string name="licenses">開源代碼許可證</string>
+    <string name="thanks">致謝</string>
+    <string name="thanks_1">FengGo</string>
+    <string name="thanks_1_desc">水表助手項目</string>
+    <string name="thanks_1_url">https://github.com/fython/PackageTracker</string>
+    <string name="thanks_2">翟宅宅Jack</string>
+    <string name="thanks_2_desc">美工</string>
+    <string name="thanks_2_url">https://plus.google.com/+YoulunZhai</string>
+    <string name="source_code">GitHub源代碼</string>
+    <string name="source_code_desc">https://github.com/TonnyL/Espresso</string>
+    <string name="support">支持</string>
+    <string name="send_advices">發送建議</string>
+    <string name="mail_account">mailto:marktonymengyi@gmail.com</string>
+    <string name="mail_topic">Espresso Advices</string>
+    <string name="send_advices_desc">幫助我改進Espresso App</string>
+    <string name="donate">捐贈</string>
+    <string name="donate_account">marktonymengyi@gmail.com</string>
+    <string name="donate_desc">為我買一杯咖啡, 讓我在夜晚寫代碼時仍然保持清醒。</string>
+    <string name="donate_msg">支付寶賬號將被複制到剪貼板, 打開支付寶並粘貼賬號即可完成捐贈。感謝你的支持!</string>
+    <string name="set_end_time_error">開始與結束的時間不能相同。</string>
+    <string name="notification_new_message">\"包裹有一條新物流信息。\"</string>
+    <!--About end-->
+
+    <!--shortcuts-->
+    <string name="shortcut_label_add_package">手動添加</string>
+    <string name="shortcut_label_search">搜索</string>
+    <string name="shortcut_label_scan_code">掃描</string>
+    <!--shortcuts end-->
+
+    <!--widget-->
+    <string name="all_packages_are_delivered">所有包裹均已送達。</string>
+    <!--widget end-->
+
+    <!--onboarding-->
+    <string name="onboarding_next_button_description">下一步</string>
+    <string name="onboarding_finish_button_description">完成</string>
+    <string name="onboarding_pre_button_description">上一步</string>
+    <string name="onboarding_section_1">簡單快速地添加包裹</string>
+    <string name="onboarding_intro_1">支持全球640餘家快遞公司, 但當你添加包裹時, 快遞公司的識別將被自動完成。</string>
+    <string name="onboarding_section_2">保持你的物流信息為最新狀態</string>
+    <string name="onboarding_intro_2">當物流信息更新後, 你將收到通知提醒, 所以你的信息將保持最新。</string>
+    <string name="onboarding_section_3">和你的Android Wear設備保持同步</string>
+    <string name="onboarding_intro_3">你可以在Android Wear設備上完成一切操作。</string>
+    <string name="onboarding_finish_button_description_wait">準備中, 請稍後…</string>
+    <!--onboarding end-->
+
+    <!--search-->
+    <string name="no_result">無結果</string>
+    <string name="search_hint">包裹或公司…</string>
+    <string name="search_label_package">包裹</string>
+    <string name="search_label_company">快遞公司</string>
+    <string name="item_loading">載入中…</string>
+    <!--search end-->
+
+    <!--custom tabs-->
+    <string name="error_no_browser">設備上沒有安裝瀏覽器。</string>
+    <!--custom tabs end-->
+
+</resources>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index a8df727..924cece 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -51,8 +51,8 @@
     <string name="remove">REMOVE</string>
     <string name="get_status_error">Unable to get the latest status.</string>
     <string name="network_error">Network error, try again later.</string>
-    <string name="package_number_copied">Package number has been copied successfully</string>
-    <string name="package_removed_msg">has been removed</string>
+    <string name="package_number_copied">Package number has been copied successfully.</string>
+    <string name="package_removed_msg">has been removed.</string>
     <string name="undo">UNDO</string>
     <string name="go_to_settings">Go to settings</string>
     <string name="to_add_packages">Click the Add button to add packages.</string>
@@ -87,7 +87,7 @@
     <string name="wrong_number_and_check">Invalid number, check it and retry.</string>
     <string name="require_permission">To support barcode scan, you need to grant camera permission.</string>
     <string name="package_name_default_pre">Package</string>
-    <string name="package_exist">The package is in your list</string>
+    <string name="package_exist">The package is in your list.</string>
     <string name="permission_denied">Permission Denied</string>
     <string name="error">Error</string>
     <string name="something_wrong">Something wrong…</string>
@@ -102,9 +102,9 @@
     <!--Settings-->
     <string name="notifications">Notifications</string>
     <string name="alert">Alert</string>
-    <string name="alert_desc">Send notifications when packages get updated</string>
+    <string name="alert_desc">Send notifications when packages get updated.</string>
     <string name="do_not_disturb_mode">Do not disturb mode</string>
-    <string name="do_not_disturb_mode_desc">Don\'t send notifications during the hours set</string>
+    <string name="do_not_disturb_mode_desc">Don\'t send notifications during the hours set.</string>
     <string name="start_time">Start time</string>
     <string name="start_time_desc">23:00</string>
     <string name="end_time">End time</string>
@@ -112,10 +112,10 @@
     <string name="notification_interval">Notification interval</string>
     <string name="browser">Browser</string>
     <string name="custom_tabs">Chrome custom tabs</string>
-    <string name="custom_tabs_desc">Open links with Chrome Custom Tabs</string>
+    <string name="custom_tabs_desc">Open links with Chrome Custom Tabs.</string>
     <string name="user_interface">User interface</string>
     <string name="navigation_bar_tint">Navigation bar tint</string>
-    <string name="navigation_bar_tint_desc">Color the navigation bar</string>
+    <string name="navigation_bar_tint_desc">Color the navigation bar.</string>
     <string name="navigation_bar_restart_msg">Changes will be applied after restarting app.</string>
     <string-array name="notification_interval">
         <item>10 minutes</item>
@@ -136,7 +136,7 @@
     <!--About-->
     <string name="version">Version</string>
     <string name="rate">Rate</string>
-    <string name="rate_desc">If you like the Espresso app, please do rate it</string>
+    <string name="rate_desc">If you like the Espresso app, please do rate it.</string>
     <string name="licenses">Licenses</string>
     <string name="thanks">Thanks</string>
     <string name="thanks_1">FengGo</string>
@@ -145,7 +145,7 @@
     <string name="thanks_2">+Youlun Zhai</string>
     <string name="thanks_2_desc">Poster designer</string>
     <string name="thanks_2_url">https://plus.google.com/+YoulunZhai</string>
-    <string name="source_code">Source code</string>
+    <string name="source_code">GitHub Source code</string>
     <string name="source_code_desc">https://github.com/TonnyL/Espresso</string>
     <string name="support">Support</string>
     <string name="send_advices">Send advices</string>
@@ -156,7 +156,7 @@
     <string name="donate_account">marktonymengyi@gmail.com</string>
     <string name="donate_desc">Buy me a cup of coffee to keep me awake during my night coding sessions.</string>
     <string name="donate_msg">Alipay account will be copied to clipboard. Launch Alipay and paste it to finish donating. Thanks for support!</string>
-    <string name="set_end_time_error">Start time can not be same as end time</string>
+    <string name="set_end_time_error">Start time can not be same as end time.</string>
     <string name="notification_new_message">\"The package has a new message\"</string>
     <!--About end-->
 
diff --git a/mobile/src/main/res/xml/shortcuts.xml b/mobile/src/main/res/xml/shortcuts.xml
index d128d5f..fd5dcce 100644
--- a/mobile/src/main/res/xml/shortcuts.xml
+++ b/mobile/src/main/res/xml/shortcuts.xml
@@ -19,7 +19,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_add"
+        android:icon="@drawable/ic_shortcut_add"
         android:shortcutId="shortcut_add_package"
         android:shortcutShortLabel="@string/shortcut_label_add_package"
         android:shortcutLongLabel="@string/shortcut_label_add_package">
@@ -35,7 +35,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_scan_code"
+        android:icon="@drawable/ic_shortcut_filter_center_focus"
         android:shortcutId="shortcut_scan_code"
         android:shortcutShortLabel="@string/shortcut_label_scan_code"
         android:shortcutLongLabel="@string/shortcut_label_scan_code">
@@ -51,7 +51,7 @@
 
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_shortcut_search"
         android:shortcutId="shortcut_search"
         android:shortcutShortLabel="@string/shortcut_label_search"
         android:shortcutLongLabel="@string/shortcut_label_search">