diff --git a/app/styles/aria-ng.css b/app/styles/aria-ng.css
index 1311678..4f86b67 100644
--- a/app/styles/aria-ng.css
+++ b/app/styles/aria-ng.css
@@ -273,6 +273,18 @@ td {
     bottom: -6px;
 }
 
+.fa-order-asc, .fa-order-desc {
+    position: relative;
+}
+
+.fa-order-asc {
+    bottom: -2px;
+}
+
+.fa-order-desc {
+    bottom: 2px;
+}
+
 /* toolbar */
 .toolbar {
     cursor: pointer;
@@ -376,7 +388,8 @@ td {
 }
 
 .task-table > .task-table-body > div.row {
-    padding: 8px;
+    padding-top: 8px;
+    padding-bottom: 8px;
     border-top: 1px solid #ddd;
 }
 
@@ -423,7 +436,7 @@ td {
     padding-left: 20px;
 }
 
-.task-table .task-download-speed {
+.task-table .task-download-speed, .task-table .task-peer-download-speed {
     font-size: 12px;
 }
 
@@ -441,6 +454,12 @@ td {
     color: #000;
 }
 
+@media (max-width: 767px) {
+    .task-table .task-peer-download-speed {
+        float: right;
+    }
+}
+
 /* settings-table */
 .settings-table {
     margin-left: 15px;
@@ -448,7 +467,8 @@ td {
 }
 
 .settings-table > div.row {
-    padding: 8px;
+    padding-top: 8px;
+    padding-bottom: 8px;
     border-top: 1px solid #ddd;
 }
 
@@ -504,7 +524,7 @@ td {
 .settings-table .tip {
     background-color: #fff !important;
     font-size: 12px;
-    padding: 4px;
+    padding: 4px 8px 4px 8px;
 }
 .settings-table .tip:hover {
     background-color: #fff !important;
diff --git a/app/views/list.html b/app/views/list.html
index fa4debb..81e1d37 100644
--- a/app/views/list.html
+++ b/app/views/list.html
@@ -6,11 +6,11 @@
                     <div class="row">
                         <div class="col-sm-8">
                             <a ng-click="changeDisplayOrder('name:asc', true)" translate>File Name</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('name:asc'), 'fa-sort-desc': isSetDisplayOrder('name:desc')}"></i>
+                            <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetDisplayOrder('name:asc'), 'fa-sort-desc fa-order-desc': isSetDisplayOrder('name:desc')}"></i>
                         </div>
                         <div class="col-sm-4">
                             <a ng-click="changeDisplayOrder('size:asc', true)" translate>File Size</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('size:asc'), 'fa-sort-desc': isSetDisplayOrder('size:desc')}"></i>
+                            <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetDisplayOrder('size:asc'), 'fa-sort-desc fa-order-desc': isSetDisplayOrder('size:desc')}"></i>
                         </div>
                     </div>
                 </div>
@@ -18,19 +18,17 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <a ng-click="changeDisplayOrder('percent:desc', true)" translate>Completed Percent</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('percent:asc'), 'fa-sort-desc': isSetDisplayOrder('percent:desc')}"></i>
+                            <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetDisplayOrder('percent:desc')}"></i>
                         </div>
                         <div class="col-sm-6">
                             <a ng-click="changeDisplayOrder('remain:asc', true)" translate>Remain Time</a>
-                            <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('remain:asc'), 'fa-sort-desc': isSetDisplayOrder('remain:desc')}"></i>
+                            <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetDisplayOrder('remain:asc'), 'fa-sort-desc fa-order-desc': isSetDisplayOrder('remain:desc')}"></i>
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-2">
-                    <div class="row">
-                        <a ng-click="changeDisplayOrder('dspeed:desc', true)" translate>Download Speed</a>
-                        <i class="fa" ng-class="{'fa-sort-asc': isSetDisplayOrder('dspeed:asc'), 'fa-sort-desc': isSetDisplayOrder('dspeed:desc')}"></i>
-                    </div>
+                    <a ng-click="changeDisplayOrder('dspeed:desc', true)" translate>Download Speed</a>
+                    <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetDisplayOrder('dspeed:asc'), 'fa-sort-desc fa-order-desc': isSetDisplayOrder('dspeed:desc')}"></i>
                 </div>
             </div>
         </div>
diff --git a/app/views/task-detail.html b/app/views/task-detail.html
index 5260cc6..42e69c3 100644
--- a/app/views/task-detail.html
+++ b/app/views/task-detail.html
@@ -118,15 +118,15 @@
                         <div class="row">
                             <div class="col-sm-8">
                                 <a ng-click="changeFileListDisplayOrder('name:asc', true)" translate>File Name</a>
-                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('name:asc'), 'fa-sort-desc': isSetFileListDisplayOrder('name:desc')}"></i>
+                                <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetFileListDisplayOrder('name:asc'), 'fa-sort-desc fa-order-desc': isSetFileListDisplayOrder('name:desc')}"></i>
                             </div>
                             <div class="col-sm-2">
                                 <a ng-click="changeFileListDisplayOrder('percent:desc', true)" translate>Completed Percent</a>
-                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('percent:asc'), 'fa-sort-desc': isSetFileListDisplayOrder('percent:desc')}"></i>
+                                <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetFileListDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetFileListDisplayOrder('percent:desc')}"></i>
                             </div>
                             <div class="col-sm-2">
                                 <a ng-click="changeFileListDisplayOrder('size:asc', true)" translate>File Size</a>
-                                <i class="fa" ng-class="{'fa-sort-asc': isSetFileListDisplayOrder('size:asc'), 'fa-sort-desc': isSetFileListDisplayOrder('size:desc')}"></i>
+                                <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetFileListDisplayOrder('size:asc'), 'fa-sort-desc fa-order-desc': isSetFileListDisplayOrder('size:desc')}"></i>
                             </div>
                         </div>
                     </div>
@@ -183,7 +183,7 @@
                                 <span ng-bind="(peer.completePercent | percent: 2) + '%'"></span>
                             </div>
                             <div class="col-sm-4 col-xs-8">
-                                <div class="task-download-speed">
+                                <div class="task-peer-download-speed">
                                     <i class="fa fa-arrow-down"></i>
                                     <span ng-bind="(peer.downloadSpeed | readableVolumn) + '/s'"></span>&nbsp;
                                     <i class="fa fa-arrow-up"></i>