diff --git a/ansibleworks/ui/static/lib/ansible/form-generator.js b/ansibleworks/ui/static/lib/ansible/form-generator.js
index fd582a076d..1cdb0db24d 100644
--- a/ansibleworks/ui/static/lib/ansible/form-generator.js
+++ b/ansibleworks/ui/static/lib/ansible/form-generator.js
@@ -722,7 +722,17 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
                        "ng-click=\"sort('" + form.related[itm].iterator + "', '" + fld + "')\">" +
                        form.related[itm]['fields'][fld].label;
                   html += " <i class=\"";
-                  html += (form.related[itm].fields[fld].key) ? "icon-sort-up" : "icon-sort";
+                  if (form.related[itm].fields[fld].key) {
+                     if (form.related[itm].fields[fld].desc) {
+                        html += "icon-sort-down";
+                     }
+                     else {
+                        html += "icon-sort-up";
+                     }
+                  }
+                  else {
+                     html += "icon-sort";
+                  }
                   html += "\"></i></a></th>\n";
               }
               html += "<th></th>\n";
@@ -881,7 +891,18 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
                          "ng-click=\"sort('" + form.related[itm].iterator + "', '" + fld + "')\">" +
                          form.related[itm]['fields'][fld].label;
                      html += " <i class=\"";
-                     html += (form.related[itm].fields[fld].key) ? "icon-sort-up" : "icon-sort";
+                     //html += (form.related[itm].fields[fld].key) ? "icon-sort-up" : "icon-sort";
+                     if (form.related[itm].fields[fld].key) {
+                        if (form.related[itm].fields[fld].desc) {
+                           html += "icon-sort-down";
+                        }
+                        else {
+                           html += "icon-sort-up";
+                        }
+                     }
+                     else {
+                        html += "icon-sort";
+                     }
                      html += "\"></i></a></th>\n";
                  }
                  html += "<th></th>\n";
diff --git a/ansibleworks/ui/static/lib/ansible/list-generator.js b/ansibleworks/ui/static/lib/ansible/list-generator.js
index 93ef97d262..8f64842b16 100644
--- a/ansibleworks/ui/static/lib/ansible/list-generator.js
+++ b/ansibleworks/ui/static/lib/ansible/list-generator.js
@@ -184,7 +184,17 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
        for (var fld in list.fields) {
            html += "<th class=\"list-header\" id=\"" + fld + "-header\" ng-click=\"sort('" + fld + "')\">" + list.fields[fld].label;
            html += " <i class=\"";
-           html += (list.fields[fld].key) ? "icon-sort-up" : "icon-sort";
+           if (list.fields[fld].key) {
+              if (list.fields[fld].desc) {
+                 html += "icon-sort-down";
+              }
+              else {
+                 html += "icon-sort-up";
+              }
+           }
+           else {
+               html += "icon-sort";
+           }
            html += "\"></i></a></th>\n";
        }
        if (options.mode == 'select') {