diff --git a/src/langs/zh_CN.json b/src/langs/zh_CN.json
index 14767e6..89c70b9 100644
--- a/src/langs/zh_CN.json
+++ b/src/langs/zh_CN.json
@@ -86,7 +86,6 @@
     "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 1ea709e..b16cefc 100644
--- a/src/scripts/config/defaultLanguage.js
+++ b/src/scripts/config/defaultLanguage.js
@@ -90,7 +90,6 @@
             '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/services/aria2TaskService.js b/src/scripts/services/aria2TaskService.js
index e3b111e..4b29307 100644
--- a/src/scripts/services/aria2TaskService.js
+++ b/src/scripts/services/aria2TaskService.js
@@ -150,7 +150,7 @@
 
                 task.selectedFileCount = selectedFileCount;
             }
-            
+
             return task;
         };
 
@@ -182,13 +182,17 @@
 
                 if (peer.peerId) {
                     var peerId = ariaNgCommonService.decodePercentEncodedString(peer.peerId);
-                    var client = (peerId ? bittorrentPeeridService.parseClient(peerId) : null);
+                    var clientInfo = (peerId ? bittorrentPeeridService.parseClient(peerId) : null);
 
-                    if (client && client.client != 'unknown') {
-                        peer.client = {
-                            name: (client.client ? client.client.trim() : ''),
-                            version: (client.version ? client.version.trim() : '')
+                    if (clientInfo && clientInfo.client != 'unknown') {
+                        var client = {
+                            name: (clientInfo.client ? clientInfo.client.trim() : ''),
+                            version: (clientInfo.version ? clientInfo.version.trim() : '')
                         };
+
+                        client.info = client.name + (client.version ? ' ' + client.version : '');
+
+                        peer.client = client;
                     }
                 }
             }
diff --git a/src/views/list.html b/src/views/list.html
index 2613ef5..4803381 100644
--- a/src/views/list.html
+++ b/src/views/list.html
@@ -38,8 +38,8 @@
                     <div class="checkbox checkbox-primary" ng-class="{'checkbox-hide': !taskContext.selected[task.gid]}">
                         <input id="{{'task_' + task.gid}}" type="checkbox" ng-model="taskContext.selected[task.gid]"/>
                         <label for="{{'task_' + task.gid}}">
-                            <span class="task-name" ng-bind="task.taskName" ng-tooltip="{{task.taskName}}" ng-tooltip-container="body"></span>
-                        </label><i class="icon-seeder fa fa-angle-double-up" ng-if="task && task.status == 'active' && task.seeder" ng-tooltip="{{'Seeding' | translate}}" ng-tooltip-container="body"></i>
+                            <span class="task-name" ng-bind="task.taskName" title="{{task.taskName}}"></span>
+                        </label><i class="icon-seeder fa fa-angle-double-up" ng-if="task && task.status == 'active' && task.seeder" title="{{'Seeding' | translate}}"></i>
                     </div>
                     <div class="task-files">
                         <span ng-bind="task.totalLength | readableVolumn"></span>
diff --git a/src/views/task-detail.html b/src/views/task-detail.html
index 80ed224..bfda2bb 100644
--- a/src/views/task-detail.html
+++ b/src/views/task-detail.html
@@ -135,7 +135,7 @@
                             <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>
+                               title="{{(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>
@@ -152,10 +152,10 @@
             </div>
             <div class="tab-pane" ng-class="{'active': context.currentTab == 'blocks'}">
                 <div class="piece-legends">
-                    <div class="piece-legend" ng-tooltip="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}" ng-tooltip-container="body">
+                    <div class="piece-legend" title="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}">
                         <div class="piece piece-completed"></div><span translate>Completed</span>
                     </div>
-                    <div class="piece-legend" ng-tooltip="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}" ng-tooltip-container="body">
+                    <div class="piece-legend" title="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}">
                         <div class="piece"></div><span translate>Uncompleted</span>
                     </div>
                 </div>
@@ -221,7 +221,7 @@
                                 <div class="checkbox checkbox-primary">
                                     <input id="{{'file_' + file.index}}" type="checkbox" ng-disabled="!task || !task.files || task.files.length < 2 || (task.status != 'waiting' && task.status != 'paused')"
                                            ng-model="file.selected" ng-change="setSelectedFile()"/>
-                                    <label for="{{'file_' + file.index}}" ng-bind="file.fileName" ng-tooltip="{{file.fileName}}" ng-tooltip-container="body"></label>
+                                    <label for="{{'file_' + file.index}}" ng-bind="file.fileName" title="{{file.fileName}}"></label>
                                 </div>
                             </div>
                             <div class="col-sm-2">
@@ -276,8 +276,7 @@
                     <div class="task-table-body">
                         <div class="row" ng-repeat="peer in context.btPeers | peerOrderBy: getPeerListOrderType()">
                             <div class="col-md-4 col-sm-4 col-xs-12">
-                                <div class="peer-name-wrapper" ng-tooltip-if="{{!!peer.client}}" ng-tooltip-container="body"
-                                     ng-tooltip="{{(peer.client ? (peer.client.name + (peer.client.version ? ' ' + peer.client.version : '')) : ('Unknown Client' | translate)) + (peer.seeder ? ', ' + ('Seeding' | translate) : '')}}">
+                                <div class="peer-name-wrapper" title="{{(peer.client ? peer.client.info : '') + (peer.seeder ? (peer.client.info ? ', ' : '') + ('Seeding' | translate) : '')}}">
                                     <span ng-bind="peer.name | translate"></span><i class="icon-seeder fa fa-angle-double-up" ng-if="peer && peer.seeder"></i>
                                     <span class="peer-client" ng-if="!!peer.client"
                                         ng-bind="peer.client ? ('(' + peer.client.name + (peer.client.version ? ' ' + peer.client.version : '') + ')') : ''"></span>