diff --git a/src/langs/zh_CN.json b/src/langs/zh_CN.json
index ac742ff..973ea71 100644
--- a/src/langs/zh_CN.json
+++ b/src/langs/zh_CN.json
@@ -17,6 +17,8 @@
     "Display Order": "显示顺序",
     "Search": "搜索",
     "Default": "默认",
+    "Expand": "展开",
+    "Collapse": "折叠",
     "Remove Task": "删除任务",
     "Clear Stopped Tasks": "清空已结束任务",
     "By File Name": "按文件名",
@@ -71,6 +73,7 @@
     "Connections": "连接数",
     "Seed Creation Time": "种子创建时间",
     "Download Dir": "下载路径",
+    "BT Tracker Servers": "BT 服务器",
     "(Choose Files)": "(选择文件)",
     "Videos": "视频",
     "Audios": "音频",
@@ -82,6 +85,7 @@
     "Status": "状态",
     "Speed": "速度",
     "(local)": "(本机)",
+    "Unknown Client": "未知客户端",
     "No Data": "无数据",
     "No connected peers": "没有连接到其他节点",
     "Failed to change some tasks state.": "修改一些任务状态时失败.",
diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js
index 4be82b3..926dd6a 100644
--- a/src/scripts/config/defaultLanguage.js
+++ b/src/scripts/config/defaultLanguage.js
@@ -21,6 +21,8 @@
             'Display Order': 'Display Order',
             'Search': 'Search',
             'Default': 'Default',
+            'Expand': 'Expand',
+            'Collapse': 'Collapse',
             'Remove Task': 'Remove Task',
             'Clear Stopped Tasks': 'Clear Stopped Tasks',
             'By File Name': 'By File Name',
@@ -75,6 +77,7 @@
             'Connections': 'Connections',
             'Seed Creation Time': 'Seed Creation Time',
             'Download Dir': 'Download Dir',
+            'BT Tracker Servers': 'BT Tracker Servers',
             '(Choose Files)': '(Choose Files)',
             'Videos': 'Videos',
             'Audios': 'Audios',
@@ -86,6 +89,7 @@
             'Status': 'Status',
             'Speed': 'Speed',
             '(local)': '(local)',
+            'Unknown Client': 'Unknown Client',
             'No Data': 'No Data',
             'No connected peers': 'No connected peers',
             'Failed to change some tasks state.': 'Failed to change some tasks state.',
diff --git a/src/scripts/controllers/task-detail.js b/src/scripts/controllers/task-detail.js
index a281ba1..cc28e2f 100644
--- a/src/scripts/controllers/task-detail.js
+++ b/src/scripts/controllers/task-detail.js
@@ -130,6 +130,7 @@
             showChooseFilesToolbar: false,
             btPeers: [],
             healthPercent: 0,
+            collapseTrackers: true,
             statusData: ariaNgMonitorService.getEmptyStatsData($routeParams.gid),
             availableOptions: [],
             options: []
diff --git a/src/styles/controls/settings-table.css b/src/styles/controls/settings-table.css
index 7ea633a..a0170c3 100644
--- a/src/styles/controls/settings-table.css
+++ b/src/styles/controls/settings-table.css
@@ -22,13 +22,20 @@
     color: red;
 }
 
-.settings-table .description {
+.settings-table .description, .settings-table .description-inline {
     color: #888;
     font-size: 12px;
     font-weight: normal;
+}
+
+.settings-table .description {
     display: block;
 }
 
+.settings-table .description-inline {
+    display: inline-block;
+}
+
 .settings-table em {
     color: #888;
     font-size: 12px;
diff --git a/src/styles/theme/default.css b/src/styles/theme/default.css
index c58ffe1..bf4f6c8 100644
--- a/src/styles/theme/default.css
+++ b/src/styles/theme/default.css
@@ -242,6 +242,10 @@
     color: #da412c;
 }
 
+.skin-aria-ng .icon-expand {
+    color: #5399e8  ;
+}
+
 .skin-aria-ng .nav-tabs-custom {
     -webkit-box-shadow: none;
     -moz-box-shadow: none;
diff --git a/src/views/task-detail.html b/src/views/task-detail.html
index 8120e8e..5f8e1c2 100644
--- a/src/views/task-detail.html
+++ b/src/views/task-detail.html
@@ -128,6 +128,19 @@
                             <span ng-bind="task.dir"></span>
                         </div>
                     </div>
+                    <div class="row" ng-if="task && task.bittorrent && task.bittorrent.announceList && task.bittorrent.announceList.length > 0">
+                        <div class="setting-key col-sm-4">
+                            <span translate>BT Tracker Servers</span>
+                            <span class="description-inline" ng-bind="'format.settings.total-count' | translate: {count: task.bittorrent.announceList.length}"></span>
+                            <i class="icon-expand pointer-cursor fa" ng-if="task.bittorrent.announceList.length > 1"
+                               ng-class="{'fa-plus': context.collapseTrackers, 'fa-minus': !context.collapseTrackers}"
+                               ng-click="context.collapseTrackers = !context.collapseTrackers"
+                               ng-tooltip="{{(context.collapseTrackers ? 'Expand' : 'Collapse') | translate}}"></i>
+                        </div>
+                        <div class="setting-value col-sm-8">
+                            <div ng-bind="serverAddress" ng-repeat="serverAddress in task.bittorrent.announceList | limitTo: (context.collapseTrackers ? 1 : task.bittorrent.announceList.length)"></div>
+                        </div>
+                    </div>
                     <div class="row no-hover no-background" ng-if="task && task.status == 'active'">
                         <div class="col-sm-12">
                             <div class="task-status-chart-wrapper">
@@ -239,11 +252,11 @@
                             <div class="col-sm-3">
                                 <span translate>Status</span>
                             </div>
-                            <div class="col-sm-2 col-xs-4">
+                            <div class="col-sm-2">
                                 <a ng-click="changePeerListDisplayOrder('percent:desc', true)" translate>Progress</a>
                                 <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetPeerListDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetPeerListDisplayOrder('percent:desc')}"></i>
                             </div>
-                            <div class="col-sm-4 col-xs-4">
+                            <div class="col-sm-4">
                                 <a ng-click="changePeerListDisplayOrder('dspeed:desc', true)" translate>Download</a>
                                 <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetPeerListDisplayOrder('dspeed:asc'), 'fa-sort-desc fa-order-desc': isSetPeerListDisplayOrder('dspeed:desc')}"></i>
                                 <span>/</span>