diff --git a/frontend/app/scripts/components/common/custom-field-labels.component.js b/frontend/app/scripts/components/common/custom-field-labels.component.js
index 4f987c97f9..3cc65868f5 100644
--- a/frontend/app/scripts/components/common/custom-field-labels.component.js
+++ b/frontend/app/scripts/components/common/custom-field-labels.component.js
@@ -3,13 +3,22 @@
 
     angular.module('theHiveComponents')
         .component('customFieldLabels', {
-            controller: function() {
+            controller: function(CustomFieldsSrv) {
+                var self = this;
+
+                this.fieldsCache = {};
                 this.fieldClicked = function(fieldName, newValue) {
                     this.onFieldClick({
                         name: fieldName,
                         value: newValue
                     });
                 };
+
+                this.$onInit = function() {
+                    CustomFieldsSrv.all().then(function(fields) {
+                        self.fieldsCache = fields;
+                    });
+                };
             },
             controllerAs: '$cmp',
             templateUrl: 'views/components/common/custom-field-labels.component.html',
diff --git a/frontend/app/styles/label.css b/frontend/app/styles/label.css
index 2b2f98d50d..f1522349a6 100644
--- a/frontend/app/styles/label.css
+++ b/frontend/app/styles/label.css
@@ -22,7 +22,7 @@
     border-left-width: 3px;
     border-left-style: solid;
 }
-.double-val-label>span:nth-child(2) {
+.double-val-label>span:last-child {
     border-bottom-right-radius: 0.25em;
     border-top-right-radius: .25em;
     /* border-left: 1px dashed #777; */
diff --git a/frontend/app/styles/main.css b/frontend/app/styles/main.css
index 7ab87b3d11..cfb024f4db 100644
--- a/frontend/app/styles/main.css
+++ b/frontend/app/styles/main.css
@@ -745,7 +745,7 @@ table.tbody-stripped > tbody:nth-child(2n+1) > tr > th {
 }
 
 table.tbody-stripped > tbody > tr:first-child > td {
-    padding-bottom:0;
+    /* padding-bottom:0; */
 }
 
 /* table.tbody-stripped > tbody > tr:nth-child(2n) > td { */
diff --git a/frontend/app/views/components/common/custom-field-labels.component.html b/frontend/app/views/components/common/custom-field-labels.component.html
index 4224a712e8..cf227347e4 100644
--- a/frontend/app/views/components/common/custom-field-labels.component.html
+++ b/frontend/app/views/components/common/custom-field-labels.component.html
@@ -8,7 +8,7 @@
         ng-click="$cmp.fieldClicked('customFields.' + cf.name, cf.value)"
         ng-if="cf.value !== undefined && cf.value !== null">
 
-        <span class="default">{{cf.name}}</span>
+        <span class="default" uib-tooltip="{{cf.description}}" tooltip-placement="top">{{$cmp.fieldsCache[cf.name].name || cf.name}}</span>
         <span class="default">{{cf.value}}</span>
     </span>
 </div>
diff --git a/frontend/app/views/partials/alert/list.html b/frontend/app/views/partials/alert/list.html
index b8067b385f..224dadefcd 100644
--- a/frontend/app/views/partials/alert/list.html
+++ b/frontend/app/views/partials/alert/list.html
@@ -178,21 +178,6 @@ <h3 class="box-title">List of alerts ({{$vm.list.total || 0}} of {{$vm.alertList
                                 <tr>
                                     <td></td>
                                     <td colspan="9">
-                                        <!-- <div class="case-tags flexwrap">
-                                            <span class="mr-xxxs text-muted"><i class="fa fa-code"></i></span>
-                                            <strong class="text-muted mr-xxxs" ng-if="!event.customFields || event.customFields.length === 0">None</strong>
-                                            <span class="double-val-label mb-xxxs mr-xxxs pointer"
-                                                ng-repeat="cf in event.customFields | orderBy:'order' track by $index"
-                                                ng-click="$vm.addFilterValue('customFields.'+cf.name, cf.value)"
-                                                ng-if="cf.value !== undefined && cf.value !== null">
-
-                                                <span class="default">{{cf.name}}</span>
-                                                <span class="default">{{cf.value}}</span>
-                                            </span>
-                                        </div>
-
-                                        <hr /> -->
-
                                         <custom-field-labels custom-fields="event.customFields" on-field-click="$vm.addFilterValue(name, value)"><custom-field-labels>
                                     </td>
                                     <td></td>
diff --git a/frontend/app/views/partials/case/case.list.html b/frontend/app/views/partials/case/case.list.html
index 9c762a8e68..c9c29928b2 100644
--- a/frontend/app/views/partials/case/case.list.html
+++ b/frontend/app/views/partials/case/case.list.html
@@ -75,6 +75,9 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseCount}
 
                                             </span>
                                         </div>
+
+                                        <custom-field-labels custom-fields="currentCase.customFields" on-field-click="$vm.addFilterValue(name, value)"><custom-field-labels>
+
                                         <div class="text-success" ng-show="currentCase.status !== 'Open'">
                                             <small>
                                                 (Closed at {{currentCase.endDate | showDate}} as <strong>{{$vm.CaseResolutionStatus[currentCase.resolutionStatus]}}</strong>)