=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2016-02-24 13:51:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2016-03-09 17:06:00 +0000
@@ -58,7 +58,10 @@
                             <th ng-repeat="eventGridColumn in eventGridColumns | filter: {show: true}" ng-if="eventGridColumn.id !== 'comment'">                                    
                                 <!-- sort icon begins -->                                
                                 <span ng-hide="eventGridColumn.showFilter" class="bold" ng-click="sortEventGrid(eventGridColumn)">
-                                    <span ng-class="{true: 'red'} [sortHeader.id == eventGridColumn.id]"><i class="fa fa-sort"></i></span>
+                                    <span class="fa-stack">
+                                        <span ng-class="{true: 'red'} [sortHeader.id === eventGridColumn.id && !reverse]"><i class="fa fa-sort-asc fa-stack-1x"></i></span>
+                                        <span ng-class="{true: 'red'} [sortHeader.id === eventGridColumn.id && reverse]"><i class="fa fa-sort-desc fa-stack-1x"></i></span>
+                                    </span>
                                     <span ng-if="eventGridColumn.id !== 'uid'">{{eventGridColumn.displayName}}</span>
                                     <span ng-if="eventGridColumn.id == 'uid'">{{eventGridColumn.displayName | translate}}</span>
                                 </span>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2016-02-15 15:47:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html	2016-03-09 17:06:00 +0000
@@ -138,7 +138,10 @@
 
                                     <!-- sort icon begins -->
                                     <span ng-click="sortGrid(gridColumn)">
-                                        <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id]"><i class="fa fa-sort hideInPrint"></i></span>
+                                        <span class="fa-stack hideInPrint">
+                                            <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id && !reverse]"><i class="fa fa-sort-asc fa-stack-1x"></i></span>
+                                            <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id && reverse]"><i class="fa fa-sort-desc fa-stack-1x"></i></span>
+                                        </span>
                                         {{gridColumn.displayName}}
                                     </span>
                                     <!-- sort icon ends -->

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html	2016-02-15 15:47:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html	2016-03-09 17:06:00 +0000
@@ -184,7 +184,10 @@
 
                                     <!-- sort icon begins -->
                                     <span ng-click="sortGrid(gridColumn)">
-                                        <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id]"><i class="fa fa-sort hideInPrint"></i></span>
+                                        <span class="fa-stack hideInPrint">
+                                            <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id && !reverse]"><i class="fa fa-sort-asc fa-stack-1x"></i></span>
+                                            <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id && reverse]"><i class="fa fa-sort-desc fa-stack-1x"></i></span>
+                                        </span>
                                         {{gridColumn.displayName}}
                                     </span>
                                     <!-- sort icon ends -->

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2016-02-15 10:16:24 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html	2016-03-09 17:06:00 +0000
@@ -23,8 +23,11 @@
                 <tr>
                     <th ng-repeat="gridColumn in gridColumns| filter:{show: true}" class='mouse-pointer' ng-click="sortGrid(gridColumn)">                            
                         <!-- sort icon begins -->                                
-                        <span ng-hide="gridColumn.showFilter" class="bold pointer" title="{{'sort'| translate}}">
-                            <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id]"><i class="fa fa-sort"></i></span>
+                        <span ng-hide="gridColumn.showFilter" class="bold pointer" title="{{'sort'| translate}}" class="fa fa-sort">
+                            <span class="fa-stack">
+                                <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id && !reverse]"><i class="fa fa-sort-asc fa-stack-1x"></i></span>
+                                <span ng-class="{true: 'red'} [sortColumn.id === gridColumn.id && reverse]"><i class="fa fa-sort-desc fa-stack-1x"></i></span>
+                            </span>
                             {{gridColumn.displayName}}
                         </span>
                         <!-- sort icon ends -->